Рефакторинг, упрощающий дальнейшую работу (#46)

bmstu-iu9 · Aug 11, 2016 · bf30cf5 · bf30cf5
1 parent 90663a2
commit bf30cf5
Showing 1 changed file with 25 additions and 18 deletions.
diff --git a/src/compiler/LowLevelRASL.sref b/src/compiler/LowLevelRASL.sref
@@ -1,5 +1,5 @@
 //FROM LibraryEx
-$EXTERN Map, Fetch, Max, Inc, Compare, MapReduce;
+$EXTERN Map, Fetch, Max, Seq, Inc, Compare, MapReduce;
 
 //FROM Library
 $EXTERN Add, StrFromInt;
@@ -467,24 +467,31 @@ Function-Body {
 }
 
 Function-Interpret {
-  e.Commands =
-    <PrepareOpenEStack
-      <OutlineConstants
-        (0 /* функции */)
-        (0 /* идентификаторы */)
-        (0 /* большие числа */)
-        (0 /* строки */)
-        (#CmdInitRAA)
-        <PrepareInterpretCommands e.Commands>
-        (#CmdFinRAA)
+  e.FunctionBody =
+    <Fetch
+      e.FunctionBody
+      <Seq
+        ConvertInterpretCommands
+        {
+          e.FunctionBody^ =
+            (#CmdInitRAA)
+            e.FunctionBody
+            (#CmdFinRAA);
+        }
+        (OutlineConstants
+          (0 /* функции */)
+          (0 /* идентификаторы */)
+          (0 /* большие числа */)
+          (0 /* строки */)
+        )
+        PrepareOpenEStack
+        {
+          e.FunctionBody^ =
+            e.FunctionBody
+            (#CmdiRunInterpret);
+        }
       >
-    >
-    (#CmdiRunInterpret);
-}
-
-PrepareInterpretCommands {
-  e.Commands =
-    <ConvertInterpretCommands e.Commands>;
+    >;
 }
 
 ConvertInterpretCommands {