Рефакторинг: выделена проверка на единственное предложение (#15)

bmstu-iu9 · Jul 10, 2018 · bcf76d5 · bcf76d5
1 parent 5776173
commit bcf76d5
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/src/compiler/HighLevelRASL-ConjointFunc-Ref.ref b/src/compiler/HighLevelRASL-ConjointFunc-Ref.ref
@@ -54,24 +54,17 @@ $ENTRY HighLevelRASL-Function-ConjointExt {
 }
 
 FindDivisionAndGenerate {
-  s.FnGenSubst s.FnGenResult
-  (e.MarkedPattern) ((e.SentenceWithSubst)) s.ContextSize s.BaseNum
-    = <GenerateSingleSentence
-        s.FnGenSubst s.FnGenResult
-        (e.MarkedPattern) (e.SentenceWithSubst) s.ContextSize
-      >;
-
   s.FnGenSubst s.FnGenResult
   (e.MarkedPattern) (e.SentencesWithSubst) s.ContextSize s.BaseNum
 
     = <FindDivision e.SentencesWithSubst>
     : {
         ForGroup (e.NewGCG-Subst) (e.FirstGroup) e.SecondGroup
-          = <GenerateFirstGroup
+          = <GenerateGroupWithGCGSubst
               s.FnGenSubst s.FnGenResult
               (e.MarkedPattern) (e.FirstGroup)
-              (e.NewGCG-Subst)
               s.ContextSize s.BaseNum
+              e.NewGCG-Subst
             >
           : s.FirstPartContext e.FirstPartCommands
 
@@ -84,7 +77,8 @@ FindDivisionAndGenerate {
 
           = <Max s.FirstPartContext s.SecondPartContext> : s.ContextSize^
 
-          = s.ContextSize (CmdSentence e.FirstPartCommands) e.SecondPartCommands;
+          = s.ContextSize
+            (CmdSentence e.FirstPartCommands) e.SecondPartCommands;
 
         ForAllSentences (e.NewGCG-Subst) e.SentencesWithSubst^
           = <GenerateGroupWithGCGSubst
@@ -96,6 +90,14 @@ FindDivisionAndGenerate {
 }
 
 GenerateGroupWithGCGSubst {
+  s.FnGenSubst s.FnGenResult
+  (e.MarkedPattern) ((e.SentenceWithSubst)) s.ContextSize s.BaseNum
+  e.NewGCG-Subst
+    = <GenerateSingleSentence
+        s.FnGenSubst s.FnGenResult
+        (e.MarkedPattern) (e.SentenceWithSubst) s.ContextSize
+      >;
+
   s.FnGenSubst s.FnGenResult
   (e.MarkedPattern) (e.SentencesWithSubst) s.ContextSize s.BaseNum
   e.NewGCG-Subst
@@ -154,25 +156,6 @@ GenerateSingleSentence {
     = s.Memory e.Commands;
 }
 
-GenerateFirstGroup {
-  s.FnGenSubst s.FnGenResult (e.MarkedPattern) ((e.SentenceWithSubst))
-  (e.NewGCG-Subst)
-  s.ContextSize s.BaseNum
-    = <GenerateSingleSentence
-        s.FnGenSubst s.FnGenResult
-        (e.MarkedPattern) (e.SentenceWithSubst) s.ContextSize
-      >;
-
-  s.FnGenSubst s.FnGenResult (e.MarkedPattern) (e.SentencesWithSubst)
-  (e.NewGCG-Subst)
-  s.ContextSize s.BaseNum
-    = <GenerateGroupWithGCGSubst
-        s.FnGenSubst s.FnGenResult
-        (e.MarkedPattern) (e.SentencesWithSubst) s.ContextSize s.BaseNum
-        e.NewGCG-Subst
-      >;
-}
-
 
 /* Перебирает переменные в обобщении и заменяет на значения подстановок */
 ComposeVars {