Skip to content

Use underscores in token names #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2015
Merged

Use underscores in token names #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions ml-proto/host/lexer.mll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,26 +136,26 @@ rule token = parse
| "case" { CASE }
| "fallthrough" { FALLTHROUGH }
| "call" { CALL }
| "call_import" { CALLIMPORT }
| "call_indirect" { CALLINDIRECT }
| "call_import" { CALL_IMPORT }
| "call_indirect" { CALL_INDIRECT }
| "return" { RETURN }

| "get_local" { GETLOCAL }
| "set_local" { SETLOCAL }
| "get_local" { GET_LOCAL }
| "set_local" { SET_LOCAL }

| (nxx as t)".load" { LOAD (memop t "") }
| (nxx as t)".load/"(align as a) { LOAD (memop t a) }
| (nxx as t)".store" { STORE (memop t "") }
| (nxx as t)".store/"(align as a) { STORE (memop t a) }

| (ixx as t)".load"(mem_size as sz)"_"(sign as s)
{ LOADEXTEND (extendop t sz s "") }
{ LOAD_EXTEND (extendop t sz s "") }
| (ixx as t)".load"(mem_size as sz)"_"(sign as s)"/"(align as a)
{ LOADEXTEND (extendop t sz s a) }
{ LOAD_EXTEND (extendop t sz s a) }
| (ixx as t)".store"(mem_size as sz)
{ STOREWRAP (wrapop t sz "") }
{ STORE_WRAP (wrapop t sz "") }
| (ixx as t)".store"(mem_size as sz)"/"(align as a)
{ STOREWRAP (wrapop t sz a) }
{ STORE_WRAP (wrapop t sz a) }

| (nxx as t)".switch" { SWITCH (value_type t) }
| (nxx as t)".const" { CONST (value_type t) }
Expand Down Expand Up @@ -237,9 +237,9 @@ rule token = parse
| "i32.reinterpret/f32" { CONVERT (Values.Int32 Int32Op.ReinterpretFloat) }
| "i64.reinterpret/f64" { CONVERT (Values.Int64 Int64Op.ReinterpretFloat) }

| "page_size" { PAGESIZE }
| "memory_size" { MEMORYSIZE }
| "resize_memory" { RESIZEMEMORY }
| "page_size" { PAGE_SIZE }
| "memory_size" { MEMORY_SIZE }
| "resize_memory" { RESIZE_MEMORY }

| "func" { FUNC }
| "param" { PARAM }
Expand All @@ -252,10 +252,10 @@ rule token = parse
| "export" { EXPORT }
| "table" { TABLE }

| "assert_invalid" { ASSERTINVALID }
| "assert_return" { ASSERTRETURN }
| "assert_return_nan" { ASSERTRETURNNAN }
| "assert_trap" { ASSERTTRAP }
| "assert_invalid" { ASSERT_INVALID }
| "assert_return" { ASSERT_RETURN }
| "assert_return_nan" { ASSERT_RETURN_NAN }
| "assert_trap" { ASSERT_TRAP }
| "invoke" { INVOKE }

| name as s { VAR s }
Expand Down
38 changes: 19 additions & 19 deletions ml-proto/host/parser.mly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ let anon_label c = {c with labels = VarMap.map ((+) 1) c.labels}

%token INT FLOAT TEXT VAR TYPE LPAR RPAR
%token NOP BLOCK IF LOOP LABEL BREAK SWITCH CASE FALLTHROUGH
%token CALL CALLIMPORT CALLINDIRECT RETURN
%token GETLOCAL SETLOCAL LOAD STORE
%token CALL CALL_IMPORT CALL_INDIRECT RETURN
%token GET_LOCAL SET_LOCAL LOAD STORE
%token CONST UNARY BINARY COMPARE CONVERT
%token FUNC PARAM RESULT LOCAL MODULE MEMORY SEGMENT IMPORT EXPORT TABLE
%token PAGESIZE MEMORYSIZE RESIZEMEMORY
%token ASSERTINVALID ASSERTRETURN ASSERTRETURNNAN ASSERTTRAP INVOKE
%token PAGE_SIZE MEMORY_SIZE RESIZE_MEMORY
%token ASSERT_INVALID ASSERT_RETURN ASSERT_RETURN_NAN ASSERT_TRAP INVOKE
%token EOF

%token<string> INT
Expand All @@ -116,8 +116,8 @@ let anon_label c = {c with labels = VarMap.map ((+) 1) c.labels}
%token<Ast.cvt> CONVERT
%token<Ast.memop> LOAD
%token<Ast.memop> STORE
%token<Ast.extop> LOADEXTEND
%token<Ast.wrapop> STOREWRAP
%token<Ast.extop> LOAD_EXTEND
%token<Ast.wrapop> STORE_WRAP

%nonassoc LOW
%nonassoc VAR
Expand Down Expand Up @@ -186,23 +186,23 @@ expr1 :
fun c -> let c', l = $2 c in let cs, e = $4 c' in
switch (l, $1 @@ at1, $3 c', List.map (fun a -> a $1) cs, e) }
| CALL var expr_list { fun c -> call ($2 c func, $3 c) }
| CALLIMPORT var expr_list { fun c -> call_import ($2 c import, $3 c) }
| CALLINDIRECT var expr expr_list
| CALL_IMPORT var expr_list { fun c -> call_import ($2 c import, $3 c) }
| CALL_INDIRECT var expr expr_list
{ fun c -> call_indirect ($2 c table, $3 c, $4 c) }
| GETLOCAL var { fun c -> get_local ($2 c local) }
| SETLOCAL var expr { fun c -> set_local ($2 c local, $3 c) }
| GET_LOCAL var { fun c -> get_local ($2 c local) }
| SET_LOCAL var expr { fun c -> set_local ($2 c local, $3 c) }
| LOAD expr { fun c -> load ($1, $2 c) }
| STORE expr expr { fun c -> store ($1, $2 c, $3 c) }
| LOADEXTEND expr { fun c -> load_extend ($1, $2 c) }
| STOREWRAP expr expr { fun c -> store_wrap ($1, $2 c, $3 c) }
| LOAD_EXTEND expr { fun c -> load_extend ($1, $2 c) }
| STORE_WRAP expr expr { fun c -> store_wrap ($1, $2 c, $3 c) }
| CONST literal { fun c -> const (literal $2 $1) }
| UNARY expr { fun c -> unary ($1, $2 c) }
| BINARY expr expr { fun c -> binary ($1, $2 c, $3 c) }
| COMPARE expr expr { fun c -> compare ($1, $2 c, $3 c) }
| CONVERT expr { fun c -> convert ($1, $2 c) }
| PAGESIZE { fun c -> page_size }
| MEMORYSIZE { fun c -> memory_size }
| RESIZEMEMORY expr { fun c -> resize_memory ($2 c) }
| PAGE_SIZE { fun c -> page_size }
| MEMORY_SIZE { fun c -> memory_size }
| RESIZE_MEMORY expr { fun c -> resize_memory ($2 c) }
;
expr_opt :
| /* empty */ { fun c -> None }
Expand Down Expand Up @@ -345,13 +345,13 @@ module_ :

cmd :
| module_ { Define $1 @@ at () }
| LPAR ASSERTINVALID module_ TEXT RPAR { AssertInvalid ($3, $4) @@ at () }
| LPAR ASSERT_INVALID module_ TEXT RPAR { AssertInvalid ($3, $4) @@ at () }
| LPAR INVOKE TEXT expr_list RPAR { Invoke ($3, $4 (c0 ())) @@ at () }
| LPAR ASSERTRETURN LPAR INVOKE TEXT expr_list RPAR expr RPAR
| LPAR ASSERT_RETURN LPAR INVOKE TEXT expr_list RPAR expr RPAR
{ AssertReturn ($5, $6 (c0 ()), $8 (c0 ())) @@ at () }
| LPAR ASSERTRETURNNAN LPAR INVOKE TEXT expr_list RPAR RPAR
| LPAR ASSERT_RETURN_NAN LPAR INVOKE TEXT expr_list RPAR RPAR
{ AssertReturnNaN ($5, $6 (c0 ())) @@ at () }
| LPAR ASSERTTRAP LPAR INVOKE TEXT expr_list RPAR TEXT RPAR
| LPAR ASSERT_TRAP LPAR INVOKE TEXT expr_list RPAR TEXT RPAR
{ AssertTrap ($5, $6 (c0 ()), $8) @@ at () }
;
cmd_list :
Expand Down