From 37ecd78688c1863016f5d85576fd3774664ee833 Mon Sep 17 00:00:00 2001
From: Minero Aoki <mineroaoki@gmail.com>
Date: Sun, 24 Feb 2008 06:31:34 +0000
Subject: [PATCH] * net/loveruby/cflat/parser/Parser.jj (INTEGER): 0xUL is
 invalid. * net/loveruby/cflat/parser/Parser.jj (CHARACTER): 'aa' is invalid.
 * net/loveruby/cflat/parser/Parser.jj: refactoring: insert spaces after
 character set comma.

git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@3917 1b9489fe-b721-0410-924e-b54b9192deb8
---
 ChangeLog                           | 10 ++++++++++
 net/loveruby/cflat/parser/Parser.jj | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 282fff6..d97e1c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Feb 24 15:31:24 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/parser/Parser.jj (INTEGER): 0xUL is invalid.
+
+	* net/loveruby/cflat/parser/Parser.jj (CHARACTER): 'aa' is
+	  invalid.
+
+	* net/loveruby/cflat/parser/Parser.jj: refactoring: insert spaces
+	  after character set comma.
+
 Mon Feb 18 06:12:14 2008  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/compiler/TypeChecker.java: TypeTable is
diff --git a/net/loveruby/cflat/parser/Parser.jj b/net/loveruby/cflat/parser/Parser.jj
index 769cf79..e1fa319 100644
--- a/net/loveruby/cflat/parser/Parser.jj
+++ b/net/loveruby/cflat/parser/Parser.jj
@@ -273,7 +273,7 @@ PARSER_END(Parser)
 
 // linear-white-spaces
 // #@@range/lex_spaces{
-SPECIAL_TOKEN: { <SPACES: ([" ","\t","\n","\r"])+> }
+SPECIAL_TOKEN: { <SPACES: ([" ", "\t", "\n", "\r", "\f", "\v"])+> }
 // #@@}
 
 // block comment
@@ -286,7 +286,7 @@ MORE: { <"/*"> : IN_BLOCK_COMMENT }
 // line comment
 // #@@range/lex_line_comment{
 SPECIAL_TOKEN: {
-    <LINE_COMMENT: "//" (~["\n","\r"])* ("\n" | "\r\n" | "\r")?>
+    <LINE_COMMENT: "//" (~["\n", "\r"])* ("\n" | "\r\n" | "\r")?>
 }
 // #@@}
 
@@ -325,7 +325,7 @@ TOKEN: {
 // identifier
 // #@@range/lex_ident{
 TOKEN: {
-    <IDENTIFIER: ["a"-"z","A"-"Z","_"] (["a"-"z","A"-"Z","_","0"-"9"])*>
+    <IDENTIFIER: ["a"-"z", "A"-"Z", "_"] (["a"-"z", "A"-"Z", "_", "0"-"9"])*>
 }
 // #@@}
 
@@ -333,7 +333,7 @@ TOKEN: {
 // #@@range/lex_integer{
 TOKEN: {
     <INTEGER: ["1"-"9"] (["0"-"9"])* ("U")? ("L")?
-            | "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])* ("U")? ("L")?
+            | "0" ["x", "X"] (["0"-"9", "a"-"f", "A"-"F"])+ ("U")? ("L")?
             | "0" (["0"-"7"])* ("U")? ("L")?
             >
 }
@@ -343,18 +343,18 @@ TOKEN: {
 // #@@range/lex_char{
 MORE: { <"'"> : IN_CHARACTER }
 <IN_CHARACTER> MORE: {
-      <~["'","\\","\n","\r"]>
-    | <"\\" (["0"-"7"]){3}>
-    | <"\\" ~[]>
+      <~["'", "\\", "\n", "\r"]> : CHARACTER_TERM
+    | <"\\" (["0"-"7"]){3}>      : CHARACTER_TERM
+    | <"\\" ~[]>                 : CHARACTER_TERM
 }
-<IN_CHARACTER> TOKEN: { <CHARACTER: "'"> : DEFAULT }
+<CHARACTER_TERM> TOKEN: { <CHARACTER: "'"> : DEFAULT }
 // #@@}
 
 // string literal
 // #@@range/lex_string{
 MORE: { <"\""> : IN_STRING }
 <IN_STRING> MORE: {
-      <(~["\"","\\","\n","\r"])+>
+      <(~["\"", "\\", "\n", "\r"])+>
     | <"\\" (["0"-"7"]){3}>
     | <"\\" ~[]>
 }