diff options
Diffstat (limited to 'backend/CMparser.mly')
| -rw-r--r-- | backend/CMparser.mly | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/backend/CMparser.mly b/backend/CMparser.mly index 41bd35a1..5f189e7b 100644 --- a/backend/CMparser.mly +++ b/backend/CMparser.mly @@ -13,7 +13,7 @@ /* */ /* *********************************************************************/ -/* Note that this compiles a superset of the language defined by the AST, +/* Note that this compiles a superset of the language defined by the AST, including function calls in expressions, matches, while statements, etc. */ %{ @@ -123,7 +123,7 @@ let mkeval e = let c1 = convert_rexpr e1 in let cl = convert_rexpr_list el in prepend_seq !convert_accu (Scall(None, sg, c1, cl)) - | Rbuiltin(sg, pef, el) -> + | Rbuiltin(sg, pef, el) -> let ef = mkef sg pef in let cl = convert_rexpr_list el in prepend_seq !convert_accu (Sbuiltin(None, ef, cl)) @@ -322,9 +322,9 @@ let mkmatch expr cases = %token LESSLESSL %token LONG %token <int64> LONGLIT -%token LONGOFINT +%token LONGOFINT %token LONGOFINTU -%token LONGOFFLOAT +%token LONGOFFLOAT %token LONGUOFFLOAT %token LOOP %token LPAREN @@ -375,7 +375,7 @@ let mkmatch expr cases = %left CARET CARETL %left AMPERSAND AMPERSANDL %left EQUALEQUAL BANGEQUAL LESS LESSEQUAL GREATER GREATEREQUAL EQUALEQUALU BANGEQUALU LESSU LESSEQUALU GREATERU GREATEREQUALU EQUALEQUALF BANGEQUALF LESSF LESSEQUALF GREATERF GREATEREQUALF EQUALEQUALL BANGEQUALL LESSL LESSEQUALL GREATERL GREATEREQUALL EQUALEQUALLU BANGEQUALLU LESSLU LESSEQUALLU GREATERLU GREATEREQUALLU -%left LESSLESS GREATERGREATER GREATERGREATERU LESSLESSL GREATERGREATERL GREATERGREATERLU +%left LESSLESS GREATERGREATER GREATERGREATERU LESSLESSL GREATERGREATERL GREATERGREATERLU %left PLUS PLUSF PLUSL MINUS MINUSF MINUSL %left STAR SLASH PERCENT STARF SLASHF SLASHU PERCENTU STARL SLASHL SLASHLU PERCENTL PERCENTLU %nonassoc BANG TILDE TILDEL p_uminus ABSF INTOFFLOAT INTUOFFLOAT FLOATOFINT FLOATOFINTU INT8S INT8U INT16S INT16U FLOAT32 INTOFLONG LONGOFINT LONGOFINTU LONGOFFLOAT LONGUOFFLOAT FLOATOFLONG FLOATOFLONGU @@ -432,12 +432,12 @@ init_data_list: /* empty */ { [] } | init_data_list_1 { $1 } ; - + init_data_list_1: init_data { [$1] } | init_data_list_1 COMMA init_data { $3 :: $1 } ; - + init_data: INT8 INTLIT { Init_int8 (coqint_of_camlint $2) } | INT16 INTLIT { Init_int16 (coqint_of_camlint $2) } @@ -453,7 +453,7 @@ init_data: | LBRACKET INTLIT RBRACKET { Init_space (Z.of_sint32 $2) } | INTLIT LPAREN STRINGLIT RPAREN { Init_addrof (intern_string $3, coqint_of_camlint $1) } ; - + /* Procedures */ proc: @@ -472,14 +472,14 @@ proc: fn_vars = List.rev (tmp @ $9); fn_stackspace = $8; fn_body = $10 })) } - | EXTERN STRINGLIT COLON signature + | EXTERN STRINGLIT COLON signature { (intern_string $2, Gfun(External(EF_external(coqstring_of_camlstring $2,$4)))) } | EXTERN STRINGLIT EQUAL eftoks COLON signature { (intern_string $2, Gfun(External(mkef $6 $4))) } ; signature: - type_ + type_ { {sig_args = []; sig_res = Some $1; sig_cc = cc_default} } | VOID { {sig_args = []; sig_res = None; sig_cc = cc_default} } |