summaryrefslogtreecommitdiff
path: root/src/fspec/ragel
diff options
context:
space:
mode:
authorJari Vetoniemi <mailroxas@gmail.com>2017-08-15 22:44:24 +0300
committerJari Vetoniemi <mailroxas@gmail.com>2018-02-23 12:55:19 +0200
commitde05c7f7d895d9903e69db8a0a9f7731f256b6a1 (patch)
tree22e738a96d98e4dfa1a3e273b4d7c5ea5c8fe89f /src/fspec/ragel
parentf37d6a105aec1110839fd257c612ca1445047ce0 (diff)
tmp
Diffstat (limited to 'src/fspec/ragel')
-rw-r--r--src/fspec/ragel/lexer-expr.rl6
-rw-r--r--src/fspec/ragel/lexer.rl2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/fspec/ragel/lexer-expr.rl b/src/fspec/ragel/lexer-expr.rl
index 2975043..0f1f83d 100644
--- a/src/fspec/ragel/lexer-expr.rl
+++ b/src/fspec/ragel/lexer-expr.rl
@@ -66,11 +66,7 @@ pop(char cur, char *mstack, size_t open)
bitwise_operators = '&' | '|' | '^' | '<<' | '>>';
main := |*
- '+' => op;
- '/' => op;
- '*' => op;
- '-' => op;
- '^' => op;
+ calc_operators => op;
stack_num => { mstack[open++] = fc;};
'(' => { };
')' => { };
diff --git a/src/fspec/ragel/lexer.rl b/src/fspec/ragel/lexer.rl
index b4a21dc..8354bc0 100644
--- a/src/fspec/ragel/lexer.rl
+++ b/src/fspec/ragel/lexer.rl
@@ -128,7 +128,7 @@
newline = '\n';
valid = ^cntrl;
comment = '//' <: valid* :>> newline;
- type = ('u8' | 's8') %r8 | ('u16' | 's16') %r16 | ('u32' | 's32') %r32 | ('u64' | 's32') %r64;
+ type = ('u8' | 's8') %r8 | ('u16' | 's16') %r16 | ('u32' | 's32') %r32 | ('u64' | 's64') %r64;
visual = 'nul' %vnul | 'dec' %vdec | 'hex' %vhex | 'str' %vstr;
# Catchers