conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support datum comment

This commit is contained in:
Yuichi Nishiwaki 2013-11-14 17:31:40 +09:00
parent 48c5c6b17c
commit e68c69ceb1
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/parse.y
View File

@ -43,6 +43,7 @@ void yylex_destroy();
pic_value datum; pic_value datum;
} }
%token tDATUM_COMMENT
%token tLPAREN tRPAREN tLBRACKET tRBRACKET tDOT tVPAREN %token tLPAREN tRPAREN tLBRACKET tRBRACKET tDOT tVPAREN
%token tQUOTE tQUASIQUOTE tUNQUOTE tUNQUOTE_SPLICING %token tQUOTE tQUASIQUOTE tUNQUOTE tUNQUOTE_SPLICING
%token <i> tINT tBOOLEAN %token <i> tINT tBOOLEAN
@ -67,7 +68,7 @@ program
p->incomp = true; p->incomp = true;
p->value = pic_undef_value(); p->value = pic_undef_value();
} }
| /* empty line */ | /* empty line */
{ {
p->value = pic_nil_value(); p->value = pic_nil_value();
} }
@ -82,6 +83,10 @@ program_data
{ {
$$ = pic_cons(p->pic, $1, $2); $$ = pic_cons(p->pic, $1, $2);
} }
| tDATUM_COMMENT datum
{
$$ = pic_nil_value();
}
; ;
incomplete_program_data incomplete_program_data
@ -92,6 +97,10 @@ incomplete_program_data
datum datum
: simple_datum : simple_datum
| compound_datum | compound_datum
| tDATUM_COMMENT datum datum
{
$$ = $3;
}
; ;
simple_datum simple_datum
@ -150,6 +159,10 @@ list_data
{ {
$$ = pic_nil_value(); $$ = pic_nil_value();
} }
| tDATUM_COMMENT datum
{
$$ = pic_nil_value();
}
| datum tDOT datum | datum tDOT datum
{ {
$$ = pic_cons(p->pic, $1, $3); $$ = pic_cons(p->pic, $1, $3);
@ -172,6 +185,10 @@ vector_data
{ {
$$ = pic_nil_value(); $$ = pic_nil_value();
} }
| tDATUM_COMMENT datum
{
$$ = pic_nil_value();
}
| datum vector_data | datum vector_data
{ {
$$ = pic_cons(p->pic, $1, $2); $$ = pic_cons(p->pic, $1, $2);
@ -202,6 +219,7 @@ incomplete_datum
| tLBRACKET incomplete_data | tLBRACKET incomplete_data
| tVPAREN incomplete_data | tVPAREN incomplete_data
| incomplete_abbrev | incomplete_abbrev
| tDATUM_COMMENT
; ;
incomplete_tail incomplete_tail

1
src/scan.l
View File

@ -41,6 +41,7 @@ infnan "+inf.0"|"-inf.0"|"+nan.0"|"-nan.0"
[ \t\n\r] /* skip whitespace */ [ \t\n\r] /* skip whitespace */
{comment} /* skip comment */ {comment} /* skip comment */
"#;" return tDATUM_COMMENT;
"." return tDOT; "." return tDOT;
"(" return tLPAREN; "(" return tLPAREN;
")" return tRPAREN; ")" return tRPAREN;