Build instructions list

logoPlayer/galgas-sources/logoPlayer-semantics.galgas

@@ -3,6 +3,10 @@ map @routineMap {
   search searchKey error message "the '%K' routine is not declared"
 }
 
+list @instructionList {
+    @instruction mInstruction
+}
+
 abstract class @instruction {
 }
 

logoPlayer/galgas-sources/logoPlayer-syntax.galgas

@@ -3,11 +3,14 @@ syntax logoPlayer_syntax (logoPlayer_lexique) {
   rule <start_symbol> {
     # Routine definition
     $PROGRAM$
+
     @routineMap routineArray = {}
+    @instructionList baseProgram = {}
+
     <routines> !? routineArray
 
     $BEGIN$
-    <instructions> !? routineArray
+    <instructions> !? routineArray !? baseProgram
     $END$
     $.$
   }
@@ -22,66 +25,71 @@ syntax logoPlayer_syntax (logoPlayer_lexique) {
   rule <routine> ?! @routineMap ioRoutineArray {
     $ROUTINE$
     $identifier$ ?let @lstring routineId
+
+    @instructionList routineProgram = {}
+
     $BEGIN$
-    <instructions> !? ioRoutineArray
+    <instructions> !? ioRoutineArray !? routineProgram
     $END$
     [ !? ioRoutineArray insertKey !routineId ]
   } 
 
-  rule <instructions> ?! @routineMap ioRoutineArray {
+  rule <instructions> ?! @routineMap ioRoutineArray ?! @instructionList program {
     repeat
     while
-      <instruction> !? ioRoutineArray
+      <instruction> !? ioRoutineArray !? program
     end
   }
 
-  rule <instruction> ?! @routineMap ioRoutineArray {
+  rule <instruction> ?! @routineMap ioRoutineArray ?! @instructionList program {
     select
-      <move>
+      <move> !? program
     or
-      <set_pen>
+      <set_pen> !? program
     or
-      <call_routine> !? ioRoutineArray
+      <call_routine> !? ioRoutineArray !? program
     end
     $;$
   }
 
-  rule <move> {
+  rule <move> ?! @instructionList program {
     select
-      <move_forward>
+      <move_forward> !? program
     or
-      <move_rotate>
+      <move_rotate> !? program
     end
   }
 
-  rule <move_forward> {
+  rule <move_forward> ?! @instructionList program {
     $FORWARD$
     $integer$ ?let @luint moveLen
 
     @instruction move = @forward.new { !moveLen }
+    program += !move
   }
 
-  rule <move_rotate> {
+  rule <move_rotate> ?! @instructionList program {
     $ROTATE$
     $integer$ ?let @luint moveAngle
 
     @instruction move = @rotate.new { !moveAngle }
+    program += !move
   }
 
-  rule <set_pen> {
+  rule <set_pen> ?! @instructionList program {
     $PEN$
+    @instruction setPen
     select
       $UP$
-
-      @instruction setPen = @penUp.new {}
+      setPen = @penUp.new {}
     or
       $DOWN$
-
-      @instruction setPen = @penDown.new {}
+      setPen = @penDown.new {}
     end
+    program += !setPen
   }
 
-  rule <call_routine> ?! @routineMap ioRoutineArray {
+  rule <call_routine> ?! @routineMap ioRoutineArray ?! @instructionList program {
     $CALL$
     $identifier$ ?let @lstring routineId
     [ ioRoutineArray searchKey !routineId ]