tuareg mode indentation

Author: danluu

lexer.ml

@@ -9,42 +9,42 @@ let rec lex = parser
   (* identifier: [a-zA-Z][a-zA-Z0-9] *)
   | [< ' ('A' .. 'Z' | 'a' .. 'z' as c); stream >] ->
     let buffer = Buffer.create 1 in
-      Buffer.add_char buffer c;
-      lex_ident buffer stream
+    Buffer.add_char buffer c;
+    lex_ident buffer stream
 
   (* number: [0-9.]+ *)
   | [< ' ('0' .. '9' as c); stream >] ->
     let buffer = Buffer.create 1 in
-      Buffer.add_char buffer c;
-      lex_number buffer stream
+    Buffer.add_char buffer c;
+    lex_number buffer stream
 
   (* Comment until end of line. *)
   | [< ' ('#'); stream >] ->
-      lex_comment stream
+    lex_comment stream
 
   (* Otherwise, just return the character as its ascii value. *)
   | [< 'c; stream >] ->
-      [< 'Token.Kwd c; lex stream >]
+    [< 'Token.Kwd c; lex stream >]
 
   (* end of stream. *)
   | [< >] -> [< >]
 
 and lex_number buffer = parser
   | [< ' ('0' .. '9' | '.' as c); stream >] ->
-      Buffer.add_char buffer c;
-      lex_number buffer stream
+    Buffer.add_char buffer c;
+    lex_number buffer stream
   | [< stream=lex >] ->
-      [< 'Token.Number (float_of_string (Buffer.contents buffer)); stream >]
+    [< 'Token.Number (float_of_string (Buffer.contents buffer)); stream >]
 
 and lex_ident buffer = parser
   | [< ' ('A' .. 'Z' | 'a' .. 'z' | '0' .. '9' as c); stream >] ->
-      Buffer.add_char buffer c;
-      lex_ident buffer stream
+    Buffer.add_char buffer c;
+    lex_ident buffer stream
   | [< stream=lex >] ->
-      match Buffer.contents buffer with
-				| "def" -> [< 'Token.Def; stream >]
-				| "extern" -> [< 'Token.Extern; stream >]
-				| id -> [< 'Token.Ident id; stream >]
+    match Buffer.contents buffer with
+			| "def" -> [< 'Token.Def; stream >]
+			| "extern" -> [< 'Token.Extern; stream >]
+			| id -> [< 'Token.Ident id; stream >]
 
 and lex_comment = parser
   | [< ' ('\n'); stream=lex >] -> stream

parser.ml

@@ -33,24 +33,24 @@ let rec parse_primary = parser
       | [< >] -> accumulator
     in
     let rec parse_ident id = parser
-        (* Call. *)
+      (* Call. *)
       | [< 'Token.Kwd '(';
-             args=parse_args [];
-             'Token.Kwd ')' ?? "expected ')'">] ->
-            Ast.Call (id, Array.of_list (List.rev args))
+           args=parse_args [];
+           'Token.Kwd ')' ?? "expected ')'">] ->
+        Ast.Call (id, Array.of_list (List.rev args))
 
-        (* Simple variable ref. *)
+      (* Simple variable ref. *)
       | [< >] -> Ast.Variable id
     in
-      parse_ident id stream
+    parse_ident id stream
 
   | [< >] -> raise (Stream.Error "unknown token when expecting an expression.")
 
 (* binoprhs
  *   ::= ('+' primary)* *)
 and parse_bin_rhs expr_prec lhs stream =
   match Stream.peek stream with
-  (* If this is a binop, find its precedence. *)
+		(* If this is a binop, find its precedence. *)
 		| Some (Token.Kwd c) when Hashtbl.mem binop_precedence c ->
       let token_prec = precedence c in
 
@@ -97,9 +97,9 @@ let parse_prototype =
 
   parser
 		| [< 'Token.Ident id;
-       'Token.Kwd '(' ?? "expected '(' in prototype";
-       args=parse_args [];
-       'Token.Kwd ')' ?? "expected ')' in prototype" >] ->
+				 'Token.Kwd '(' ?? "expected '(' in prototype";
+				 args=parse_args [];
+				 'Token.Kwd ')' ?? "expected ')' in prototype" >] ->
       (* success. *)
       Ast.Prototype (id, Array.of_list (List.rev args))
 
@@ -109,13 +109,13 @@ let parse_prototype =
 (* definition ::= 'def' prototype expression *)
 let parse_definition = parser
   | [< 'Token.Def; p=parse_prototype; e=parse_expr >] ->
-      Ast.Function (p, e)
+    Ast.Function (p, e)
 
 (* toplevelexpr ::= expression *)
 let parse_toplevel = parser
   | [< e=parse_expr >] ->
       (* Make an anonymous proto. *)
-      Ast.Function (Ast.Prototype ("", [||]), e)
+    Ast.Function (Ast.Prototype ("", [||]), e)
 
 (*  external ::= 'extern' prototype *)
 let parse_extern = parser

toplevel.ml

@@ -7,7 +7,7 @@ let rec main_loop stream =
   match Stream.peek stream with
 		| None -> ()
 
-  (* ignore top-level semicolons. *)
+		(* ignore top-level semicolons. *)
 		| Some (Token.Kwd ';') ->
       Stream.junk stream;
       main_loop stream