Skip to content

Commit

Permalink
Merge pull request #87 from walter-weinmann/wwe
Browse files Browse the repository at this point in the history
Version 1.4.2.
  • Loading branch information
walter-weinmann authored Nov 18, 2017
2 parents 588528a + 04767e2 commit 1a86e33
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/oclexer.xrl
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ Erlang code.
{"^(?i)(ASC)$", 'ASC'},
{"^(?i)(ASCENDING)$", 'ASCENDING'},
{"^(?i)(BY)$", 'BY'},
{"^(?i)(CALL)$", 'CALL'},
{"^(?i)(CASE)$", 'CASE'},
{"^(?i)(CONSTRAINT)$", 'CONSTRAINT'},
{"^(?i)(CONTAINS)$", 'CONTAINS'},
Expand Down
2 changes: 1 addition & 1 deletion src/ocparse.yrl
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ Endsymbol
%% Operator precedences.
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Nonassoc 500 properties. % atom vs. properties / literal vs. properties
Nonassoc 100 properties. % atom vs. properties / literal vs. properties

%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Grammar rules.
Expand Down

0 comments on commit 1a86e33

Please sign in to comment.