Commits

Pierre Surply  committed e94568e

Lexer : Fix asm nl

  • Participants
  • Parent commits 0cd1824

Comments (0)

Files changed (2)

File compiler/main.ml

 **    along with Mara.  If not, see <http://www.gnu.org/licenses/>.
 **
 ** Started on  Fri Nov  9 15:58:29 2012 Pierre Surply
-** Last update Fri Mar 29 17:52:22 2013 Pierre Surply
+** Last update Fri Apr  5 21:57:41 2013 Pierre Surply
 *)
 
 open Conf
 	      "Verbose");
 	     ("-clean",
 	      Arg.Unit
-		(fun () -> 
-		  let _ = Sys.command "rm -rf _mbuild/ *.hex"
-		  in ()),
-	      "Remove build directory and .hex files");
+		(fun () ->
+                  let arg =
+                    [| "rm"; "-rf";
+                       "_mbuild/"
+                    |]
+                  in
+                  Unix.execvp arg.(0) arg),
+	      "Remove build directory");
 	     ("-dot",
 	      Arg.String Dot.ffsm2dot,
 	      "Verbose");

File compiler/parser/lexer.mll

 **    along with Mara.  If not, see <http://www.gnu.org/licenses/>.
 **
 ** Started on  Fri Nov  9 15:58:41 2012 Pierre Surply
-** Last update Fri Mar 29 18:57:53 2013 Pierre Surply
+** Last update Mon Apr  8 08:30:50 2013 Pierre Surply
 *)
 
 {
                           str s lexbuf}
 and asmstr s = parse
     | '"'               { () }
-    | '\n' [' ' '\t']*  { Buffer.add_string s "\n\t";
+    | '\n' [' ' '\t']*  { nl lexbuf;
+                          Buffer.add_string s "\n\t";
                           asmstr s lexbuf}
     | _ as c            { Buffer.add_char s c;
                           asmstr s lexbuf}