Initial unicode character support for identifiers and whitespace

Summary: Test Plan: Added a test Reviewers: Subscribers: Tasks: Tags:
prestodb · Jan 10, 2023 · e9f30c0 · e9f30c0
1 parent 19f8399
commit e9f30c0
Show file tree

Hide file tree

Showing 7 changed files with 25,375 additions and 5 deletions.
diff --git a/parser/cpp/prepare-javacc-grammar.sh b/parser/cpp/prepare-javacc-grammar.sh
@@ -3,4 +3,4 @@ pwd
 GRAMMAR_DIR='../grammar'
 GEN_DIR='target/generated-sources/javacc'
 mkdir -p $GEN_DIR
-cat ./javacc-options.txt $GRAMMAR_DIR/nonreservedwords.txt $GRAMMAR_DIR/reservedwords.txt $GRAMMAR_DIR/sql-spec.txt $GRAMMAR_DIR/presto-extensions.txt $GRAMMAR_DIR/lexical-elements.txt > $GEN_DIR/parser_tmp.jjt
+cat ./javacc-options.txt $GRAMMAR_DIR/nonreservedwords.txt $GRAMMAR_DIR/reservedwords.txt $GRAMMAR_DIR/sql-spec.txt $GRAMMAR_DIR/presto-extensions.txt $GRAMMAR_DIR/unicode-identifier-start.txt $GRAMMAR_DIR/unicode-identifier-extend.txt $GRAMMAR_DIR/ws.txt $GRAMMAR_DIR/lexical-elements.txt > $GEN_DIR/parser_tmp.jjt
diff --git a/parser/grammar/lexical-elements.txt b/parser/grammar/lexical-elements.txt
@@ -80,12 +80,14 @@ regular_identifier()
 
 | <#identifier_part: <identifier_start> | <identifier_extend> >
 
-| <#identifier_start: ["a"-"z"]  // temp
+| <#identifier_start: (<UnicodeIdentifierStart>)
 /*!! See the Syntax Rules.*/
+/* Unicode char classes: <Ll> | <Lm> | <Lo> | <Lt> | <Lu> | <Nl> */
 >
 
-| <#identifier_extend:  ["\u00B7", "0"-"9", "_"] // temp
+| <#identifier_extend:  ["\u00B7"] | <UnicodeIdentifierExtend>
 //!! See the Syntax Rules.
+/* Unicode char classes: <Mn>, <Mc>, <Nd>, <Pc>, <Cf> */
 >
 
 | <large_object_length_token: ( <digit> )+ <multiplier> >
@@ -150,7 +152,14 @@ delimiter_token:
 
 SPECIAL_TOKEN:
 {
-<white_space:  <newline> | [ " ", "\t" ] // temp
+<white_space:  (<UnicodeWhiteSpace> |  
+                [ "\u0009"    // Horizontal Tabulation
+                 , "\n"       // "\\u000A"    //,   Line Feed
+                 , "\u000B"   // Vertical Tabulation
+                 , "\f"       // "\\u000C"    //, Form Feed
+                 , "\r"       // "\\u000D"    //, Carriage Return
+                 , "\u0085"   // Next Line
+                ])
 //!! See the Syntax Rules.
 >
 

diff --git a/parser/grammar/prepare-javacc-grammar.sh b/parser/grammar/prepare-javacc-grammar.sh
@@ -1,4 +1,4 @@
 # Concatenate all the fragments into a .jj file.
 gendir='../target/generated-sources/javacc'
 mkdir -p $gendir
-cat javacc-options-java.txt nonreservedwords.txt reservedwords.txt sql-spec.txt presto-extensions.txt lexical-elements.txt > $gendir/parser_tmp.jjt
+cat javacc-options-java.txt nonreservedwords.txt reservedwords.txt sql-spec.txt presto-extensions.txt unicode-identifier-start.txt unicode-identifier-extend.txt ws.txt lexical-elements.txt > $gendir/parser_tmp.jjt
diff --git a/parser/grammar/unicode-identifier-extend.txt b/parser/grammar/unicode-identifier-extend.txt
diff --git a/parser/grammar/unicode-identifier-start.txt b/parser/grammar/unicode-identifier-start.txt
diff --git a/parser/grammar/ws.txt b/parser/grammar/ws.txt
@@ -0,0 +1,32 @@
+TOKEN:
+{
+<#Zl: [
+  "\u2028"    //LINE SEPARATOR;Zl;0;WS;;;;;N;;;;;
+ ]>
+
+| <#Zp: [
+   "\u2029"    //PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;;
+]>
+
+| <#Zs: [
+   "\u0020"    //SPACE;Zs;0;WS;;;;;N;;;;;
+ , "\u00A0"    //NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;NON-BREAKING SPACE;;;;
+ , "\u1680"    //OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
+ , "\u2000"    //EN QUAD;Zs;0;WS;2002;;;;N;;;;;
+ , "\u2001"    //EM QUAD;Zs;0;WS;2003;;;;N;;;;;
+ , "\u2002"    //EN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u2003"    //EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u2004"    //THREE-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u2005"    //FOUR-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u2006"    //SIX-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u2007"    //FIGURE SPACE;Zs;0;WS;<noBreak> 0020;;;;N;;;;;
+ , "\u2008"    //PUNCTUATION SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u2009"    //THIN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u200A"    //HAIR SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u202F"    //NARROW NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;;;;;
+ , "\u205F"    //MEDIUM MATHEMATICAL SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+ , "\u3000"    //IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
+]>
+
+| <#UnicodeWhiteSpace: (<Zl> | <Zp> | <Zs>)>
+}
diff --git a/parser/src/test/java/com/facebook/coresql/parser/TestSqlParser.java b/parser/src/test/java/com/facebook/coresql/parser/TestSqlParser.java
@@ -52,6 +52,7 @@ public class TestSqlParser
             "SELECT f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f())))))))))))))))))))))))))))));",
             "SELECT abs, 2 as abs;",
             "SELECT sqrt(x), power(y, 5), myFunction('a') FROM T;",
+            "SELECT 1 ఒకటి;",
     };
 
     private AstNode parse(String sql)