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