From 453f9672289196b1f393df283ce0e4d57d8cfaa5 Mon Sep 17 00:00:00 2001 From: vadim Date: Fri, 1 Dec 2017 09:24:27 +0200 Subject: [PATCH] skip doc comments --- lexer.go | 9 +++------ lexer.l | 6 +++--- parser.go | 14 +++++++++++--- parser.y | 14 +++++++++++--- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lexer.go b/lexer.go index a90231d..fbacc36 100644 --- a/lexer.go +++ b/lexer.go @@ -8552,20 +8552,17 @@ yyrule124: // \?\? } yyrule125: // (#|[/][/]){NEW_LINE} { - lval.token = string(l.TokenBytes(nil)) - return T_COMMENT // TODO: handle ?> + // lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> goto yystate0 } yyrule126: // [/][*][^*]*[*]+([^*/][^*]*[*]+)*[/] { - lval.token = string(l.TokenBytes(nil)) - return T_COMMENT // TODO: handle ?> + // lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> goto yystate0 } yyrule127: // [/][*][*][^*]*[*]+([^*/][^*]*[*]+)*[/] { - lval.token = string(l.TokenBytes(nil)) - return T_DOC_COMMENT // TODO: handle ?> + // lval.token = string(l.TokenBytes(nil)); return T_DOC_COMMENT; // TODO: handle ?> goto yystate0 } yyrule128: // '[^']*(\\')*' diff --git a/lexer.l b/lexer.l index 5523809..bd48c60 100644 --- a/lexer.l +++ b/lexer.l @@ -335,9 +335,9 @@ NEW_LINE (\r|\n|\r\n) \<\< lval.token = string(l.TokenBytes(nil)); return T_SL \>\> lval.token = string(l.TokenBytes(nil)); return T_SR \?\? lval.token = string(l.TokenBytes(nil)); return T_COALESCE -(#|[/][/]){NEW_LINE} lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> -[/][*][^*]*[*]+([^*/][^*]*[*]+)*[/] lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> -[/][*][*][^*]*[*]+([^*/][^*]*[*]+)*[/] lval.token = string(l.TokenBytes(nil)); return T_DOC_COMMENT; // TODO: handle ?> +(#|[/][/]){NEW_LINE} // lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> +[/][*][^*]*[*]+([^*/][^*]*[*]+)*[/] // lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> +[/][*][*][^*]*[*]+([^*/][^*]*[*]+)*[/] // lval.token = string(l.TokenBytes(nil)); return T_DOC_COMMENT; // TODO: handle ?> '[^']*(\\')*' lval.token = string(l.TokenBytes(nil)); return T_CONSTANT_ENCAPSED_STRING {OPERATORS} lval.token = string(l.TokenBytes(nil)); return rune2Class(rune(l.TokenBytes(nil)[0])) diff --git a/parser.go b/parser.go index af5c4a8..65005c4 100644 --- a/parser.go +++ b/parser.go @@ -369,10 +369,18 @@ const yyErrCode = 2 const yyInitialStackSize = 16 //line parser.y:1286 -const src = `