Merge pull request #98 from engboris/syntax

Allow explicit end of blocks (end process, end galaxy, end interface)

Author: engboris

src/stellogen/sgen_parser.mly

@@ -30,7 +30,8 @@ let declaration :=
   | ~=SYM; EOL*; EQ; EOL*;
     ~=galaxy_expr;                 <Def>
   | INTERFACE; EOL*; x=SYM; EOL*;
-    i=interface_item*; END;        { Def (x, Raw (Interface i)) }
+    i=interface_item*;
+    END; INTERFACE?;               { Def (x, Raw (Interface i)) }
   | SHOW; EOL*; ~=galaxy_expr;     <Show>
   | SHOWEXEC; EOL*; ~=galaxy_expr; <ShowExec>
   | TRACE; EOL*; ~=galaxy_expr;    <Trace>
@@ -44,15 +45,15 @@ let type_declaration :=
 
 let galaxy_expr :=
   | ~=galaxy_content; EOL*; DOT; <>
-  | ~=galaxy_block; END;         <>
+  | ~=galaxy_block;              <>
   | ~=undelimited_raw_galaxy;    <Raw>
 
 let interface_item :=
   | ~=type_declaration; EOL*; <>
 
 let undelimited_raw_galaxy :=
-  | ~=marked_constellation; EOL*; DOT;       <Const>
-  | GALAXY; EOL*; ~=galaxy_item*; EOL*; END; <Galaxy>
+  | ~=marked_constellation; EOL*; DOT;                <Const>
+  | GALAXY; EOL*; ~=galaxy_item*; EOL*; END; GALAXY?; <Galaxy>
 
 let delimited_raw_galaxy :=
   | ~=pars(marked_constellation);   <Const>
@@ -82,14 +83,18 @@ let galaxy_item :=
   | ~=SYM; EQ; EOL*; ~=galaxy_content; DOT; EOL*; <GLabelDef>
   | x=SYM; EQ; EOL*; mcs=marked_constellation; EOL*; DOT; EOL*;
     { GLabelDef (x, Raw (Const mcs)) }
-  | ~=SYM; EQ; EOL*; ~=galaxy_block; END; EOL*;   <GLabelDef>
+  | ~=SYM; EQ; EOL*; ~=galaxy_block; EOL*;   <GLabelDef>
   | ~=type_declaration; EOL*;                     <GTypeDef>
 
 let galaxy_block :=
-  | PROCESS; EOL*;                        { Process [] }
-  | PROCESS; EOL*; ~=process_item+;       <Process>
-  | EXEC; EOL*; ~=galaxy_content;         <Exec>
-  | EXEC; EOL*; mcs=marked_constellation; { Exec (Raw (Const mcs)) }
+  | PROCESS; EOL*; END; PROCESS?;
+    { Process [] }
+  | PROCESS; EOL*; ~=process_item+; END; PROCESS?;
+    <Process>
+  | EXEC; EOL*; ~=galaxy_content; END; EXEC?;
+    <Exec>
+  | EXEC; EOL*; mcs=marked_constellation; END; EXEC?;
+    { Exec (Raw (Const mcs)) }
 
 let process_item :=
   | ~=galaxy_content; DOT; EOL*;    <>