miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix c_comments

Browse Source
This commit is contained in:
Nathan Braswell
2015-06-19 19:36:34 -04:00
parent 457998e0ff
commit 5d688a5822
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
krakenGrammer.kgm
View File

@@ -27,8 +27,9 @@ actual_white = line_white | line_break | line_break actual_white | line_white ac
WS = actual_white | WS comment WS | WS comment | ; WS = actual_white | WS comment WS | WS comment | ;
# cpp_comment lets us do stuff like ending a statement with a cpp comment - c comments already work as they don't eat the return # cpp_comment lets us do stuff like ending a statement with a cpp comment - c comments already work as they don't eat the return
maybe_line_white = "( | )+" | ; maybe_line_white = "( | )+" | c_comment | maybe_line_white c_comment | maybe_line_white "( | )+" | ;
line_end = maybe_line_white ";" | maybe_line_white line_break | maybe_line_white cpp_comment | WS c_comment line_end ; line_end = maybe_line_white ";" | maybe_line_white line_break | maybe_line_white cpp_comment ;
#line_end = maybe_line_white ";" | maybe_line_white line_break | maybe_line_white cpp_comment | WS c_comment line_end ;
# line_end = "( | )+" ";" | "( | )+" line_break | "( | )+" cpp_comment | ";" | line_break | cpp_comment ; # line_end = "( | )+" ";" | "( | )+" line_break | "( | )+" cpp_comment | ";" | line_break | cpp_comment ;
# line_end = WS ";" | WS line_break | WS cpp_comment ; # line_end = WS ";" | WS line_break | WS cpp_comment ;
@@ -99,7 +100,7 @@ statement = if_statement | while_loop | for_loop | return_statement line_end | b
break_statement = "break" ; break_statement = "break" ;
continue_statement = "continue" ; continue_statement = "continue" ;
defer_statement = "defer" WS statement ; defer_statement = "defer" WS statement ;
function_call = unarad "\(" WS opt_parameter_list WS "\)" ; function_call = unarad WS "\(" WS opt_parameter_list WS "\)" ;
boolean_expression = boolean_expression WS "\|\|" WS and_boolean_expression | and_boolean_expression ; boolean_expression = boolean_expression WS "\|\|" WS and_boolean_expression | and_boolean_expression ;
and_boolean_expression = and_boolean_expression WS "&&" WS bool_exp | bool_exp ; and_boolean_expression = and_boolean_expression WS "&&" WS bool_exp | bool_exp ;

1
tests/test_c_comments.expected_results Normal file
View File

@@ -0,0 +1 @@
1

8
tests/test_c_comments.krak Normal file
View File

@@ -0,0 +1,8 @@
/*here*/
/*here*/import /*here*/io/*here*/:/*here*/*/*here*/
/*here*/
/*here*/fun/*here*/ main/*here*/(/*here*/)/*here*/:/*here*/ int/*here*/ {/*here*/
/*here*/ println/*here*/( /*here*/1 /*here*/ )/*here*/
/*here*/ return /*here*/0/*here*/
/*here*/}/*here*/
/*here*/