Merge pull request #17 from danikp/master

more Erlang 18 updates

.travis.yml

@@ -2,6 +2,8 @@ language: erlang
 sudo: false
 otp_release:
 # Test on all supported releases
+   - 18.2.1
+   - 18.1
    - 18.0
    - 17.5
    - 17.4

Makefile

@@ -1,4 +1,6 @@
 REBAR=./rebar
+GIT = git
+REBAR_VER = 2.6.1
 
 ## dialyzer
 PLT_FILE = ~/aleppo.plt
@@ -14,6 +16,14 @@ compile:
 run:
 	@$(REBAR) shell
 
+rebar_src:
+	@rm -rf $(PWD)/rebar_src
+	@$(GIT) clone git://github.com/rebar/rebar.git rebar_src
+	@$(GIT) -C rebar_src checkout tags/$(REBAR_VER)
+	@cd $(PWD)/rebar_src/; ./bootstrap
+	@cp $(PWD)/rebar_src/rebar $(PWD)
+	@rm -rf $(PWD)/rebar_src
+
 dialyze: all
 	@[ -f $(PLT_FILE) ] || $(MAKE) plt
 	@dialyzer --plt $(PLT_FILE) $(DIALYZER_OPTS) ebin || [ $$? -eq 2 ];

rebar.config

@@ -1 +1,9 @@
-{erl_opts, [ {platform_define, "^R|17", pre18} ]}.
+%-*-Erlang-*-
+% vim: ft=erlang
+{erl_opts, [
+            debug_info,
+            warn_unused_vars,
+            warn_unused_import,
+            warn_exported_vars,
+            {platform_define, "^R|17", pre18}
+           ]}.

src/aleppo.app.src

@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, aleppo,
  [{description, "Aleppo: ALternative Erlang Pre-ProcessOr"},
-  {vsn, "0.8.15"},
+  {vsn, "0.9"},
   {modules, [
             ]},
   {applications, [kernel, stdlib]},

src/aleppo.erl

@@ -404,7 +404,7 @@ mark_keywords([{'-', DashAttrs} = Dash,
                           end,
             mark_keywords(Rest, Mod, [MarkedToken, Dash|Acc]);
         _ ->
-            mark_keywords(Rest, Mod, [Token |Acc])
+            mark_keywords(Rest, Mod, [Token, Dash|Acc])
     end;
 mark_keywords([Other|Rest], Mod, Acc) ->
     mark_keywords(Rest, Mod, [Other|Acc]).

src/aleppo_parser.yrl

@@ -39,21 +39,25 @@ Terminals
     '?'
 
     char integer float atom string var
-    '(' ')' ',' '-'
-    '->' ':-' '{' '}' '[' ']' '|' '||' '<-' ';' ':' '#' '.' ':=' '=>'
+
+    '(' ')' ',' '->' '{' '}' '[' ']' '|' '||' '<-' ';' ':' '#' '.'
     'after' 'begin' 'case' 'try' 'catch' 'end' 'fun' 'if' 'of' 'receive' 'when'
-    'andalso' 'orelse' 'query' 'spec'
+    'andalso' 'orelse'
     'bnot' 'not'
     '*' '/' 'div' 'rem' 'band' 'and'
-    '+' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor'
+    '+' '-' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor'
     '++' '--'
-    '==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<='
+    '==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<=' '=>' ':='
     '<<' '>>'
     '!' '=' '::' '..' '...'
-    comment dot.
+    'spec' 'callback' % helper
+    comment
+    dot.
 
 Rootsymbol File.
 
+Unary 200 '('.
+
 File -> Elements eof : '$1' ++ ['$2'].
 File -> Elements : '$1' ++ [{eof, 0}].
 
@@ -145,7 +149,6 @@ ExpressionToken -> atom : '$1'.
 ExpressionToken -> string : '$1'.
 ExpressionToken -> var : '$1'.
 ExpressionToken -> '->' : '$1'.
-ExpressionToken -> ':-' : '$1'.
 ExpressionToken -> '|' : '$1'.
 ExpressionToken -> '||' : '$1'.
 ExpressionToken -> '<-' : '$1'.
@@ -168,8 +171,8 @@ ExpressionToken -> 'receive' : '$1'.
 ExpressionToken -> 'when' : '$1'.
 ExpressionToken -> 'andalso' : '$1'.
 ExpressionToken -> 'orelse' : '$1'.
-ExpressionToken -> 'query' : '$1'.
 ExpressionToken -> 'spec' : '$1'.
+ExpressionToken -> 'callback' : '$1'.
 ExpressionToken -> 'bnot' : '$1'.
 ExpressionToken -> 'not' : '$1'.
 ExpressionToken -> '*' : '$1'.