endlines delimit expressions

marianoguerra · Mar 23, 2016 · c04c56b · c04c56b
1 parent 412bfd2
commit c04c56b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/examples/trues.otl b/examples/trues.otl
@@ -1 +1,11 @@
-true true true
+
+true
+
+false
+
+12
+
+
+
+13.4
+
diff --git a/src/otl_lexer.xrl b/src/otl_lexer.xrl
@@ -16,7 +16,8 @@ Rules.
 {Float}   : make_token(float,   TokenLine, TokenChars, fun erlang:list_to_float/1).
 
 % spaces, tabs and new lines
-{Endls}                 : skip_token.
+{Endls}+                 : make_token(nl, TokenLine, endls(TokenChars)).
+
 {Whites}                : skip_token.
 {Tabs}                  : skip_token.
 
@@ -29,3 +30,6 @@ make_token(Name, Line, Chars) ->
 
 make_token(Name, Line, Chars, Fun) ->
     {token, {Name, Line, Fun(Chars)}}.
+
+endls(Chars) ->
+    lists:filter(fun (C) -> C == $\n end, Chars).
diff --git a/src/otl_parser.yrl b/src/otl_parser.yrl
@@ -3,15 +3,17 @@ Nonterminals
     program tl_exprs tl_expr.
 
 Terminals
-    float integer boolean.
+    float integer boolean nl.
 
 Rootsymbol
     program.
 
+program -> nl tl_exprs : '$2'.
 program -> tl_exprs : '$1'.
 
 tl_exprs -> tl_expr : ['$1'].
-tl_exprs -> tl_expr tl_exprs : ['$1'|'$2'].
+tl_exprs -> tl_expr nl: ['$1'].
+tl_exprs -> tl_expr nl tl_exprs : ['$1'|'$3'].
 
 tl_expr -> boolean : {atom, line('$1'), unwrap('$1')}.
 tl_expr -> integer: '$1'.