From e41b97a09d0e4c2ff100c9ef75c06c28d2031180 Mon Sep 17 00:00:00 2001 From: z7zmey Date: Fri, 1 Dec 2017 17:55:44 +0200 Subject: [PATCH] fix inline comment --- scanner.go | 8 +++++++- scanner.l | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scanner.go b/scanner.go index 328a11c..47f8f98 100644 --- a/scanner.go +++ b/scanner.go @@ -685,6 +685,8 @@ yystate19: goto yystate20 case c == '\r': goto yystate21 + case c >= '\x01' && c <= '\t' || c == '\v' || c == '\f' || c >= '\x0e' && c <= 'ÿ': + goto yystate19 } yystate20: @@ -702,6 +704,10 @@ yystate21: goto yyrule125 case c == '\n': goto yystate20 + case c == '\r': + goto yystate21 + case c >= '\x01' && c <= '\t' || c == '\v' || c == '\f' || c >= '\x0e' && c <= 'ÿ': + goto yystate19 } yystate22: @@ -8450,7 +8456,7 @@ yyrule124: // \?\? return T_COALESCE goto yystate0 } -yyrule125: // (#|[/][/]){NEW_LINE} +yyrule125: // (#|[/][/]).*{NEW_LINE} { // lval.token = string(l.TokenBytes(nil)); return T_COMMENT; // TODO: handle ?> goto yystate0 diff --git a/scanner.l b/scanner.l index 7bde821..c8bb2fc 100644 --- a/scanner.l +++ b/scanner.l @@ -236,7 +236,7 @@ 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 ?> +(#|[/][/]).*{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