diff options
| author | Alasdair Armstrong | 2017-12-04 15:35:05 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2017-12-04 15:35:05 +0000 |
| commit | d9f2fa400731d007ed2874f37ff8d8a649b73a9d (patch) | |
| tree | a86b399e7c10ed3fdea6a5e70f12f194e2e0ec14 | |
| parent | a8940494d24f1315852e45632e968d1cfdbb132a (diff) | |
Fix warnings in test suite
| -rw-r--r-- | src/lexer.mll | 2 | ||||
| -rw-r--r-- | src/pre_lexer.mll | 2 | ||||
| -rwxr-xr-x | test/typecheck/run_tests.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lexer.mll b/src/lexer.mll index 3b1a1583..1443e94d 100644 --- a/src/lexer.mll +++ b/src/lexer.mll @@ -157,7 +157,7 @@ let binarydigit = ['0'-'1'] let hexdigit = ['0'-'9''A'-'F''a'-'f'] let alphanum = letter|digit let startident = letter|'_' -let ident = alphanum|['_''\''] +let ident = alphanum|['_''\'''#'] let tyvar_start = '\'' let oper_char = ['!''$''%''&''*''+''-''.''/'':''<''=''>''?''@''^''|''~'] let escape_sequence = ('\\' ['\\''\"''\'''n''t''b''r']) | ('\\' digit digit digit) | ('\\' 'x' hexdigit hexdigit) diff --git a/src/pre_lexer.mll b/src/pre_lexer.mll index f648a594..7e119118 100644 --- a/src/pre_lexer.mll +++ b/src/pre_lexer.mll @@ -118,7 +118,7 @@ let binarydigit = ['0'-'1'] let hexdigit = ['0'-'9''A'-'F''a'-'f'] let alphanum = letter|digit let startident = letter|'_' -let ident = alphanum|['_''\''] +let ident = alphanum|['_''\'''#'] let tyvar_start = '\'' let oper_char = ['!''$''%''&''*''+''-''.''/'':''<''=''>''?''@''^''|''~'] let escape_sequence = ('\\' ['\\''\"''\'''n''t''b''r']) | ('\\' digit digit digit) | ('\\' 'x' hexdigit hexdigit) diff --git a/test/typecheck/run_tests.sh b/test/typecheck/run_tests.sh index 48cf070b..a2567d21 100755 --- a/test/typecheck/run_tests.sh +++ b/test/typecheck/run_tests.sh @@ -62,7 +62,7 @@ for i in `ls $DIR/pass/`; do if $SAILDIR/sail -ddump_tc_ast -dsanity $DIR/pass/$i 2> /dev/null 1> $DIR/rtpass/$i; then - if $SAILDIR/sail -ddump_tc_ast -dno_cast -dsanity $DIR/rtpass/$i 2> /dev/null 1> $DIR/rtpass2/$i; + if $SAILDIR/sail -ddump_tc_ast -dmagic_hash -dno_cast -dsanity $DIR/rtpass/$i 2> /dev/null 1> $DIR/rtpass2/$i; then if diff $DIR/rtpass/$i $DIR/rtpass2/$i; then @@ -86,7 +86,7 @@ do then red "tested $i expecting fail" "pass" else - if $SAILDIR/sail -dno_cast -just_check $DIR/rtfail/$i 2> /dev/null; + if $SAILDIR/sail -dno_cast -dmagic_hash -just_check $DIR/rtfail/$i 2> /dev/null; then yellow "tested $i expecting fail" "passed re-check" else |