Support both () and [] for array expression

Change-Id: I9b63a51fb1bc654230456be8fbca493f65e06cdd
Signed-off-by: Kunlin Yu <yukunlin@syriusrobotics.com>

Author: kunlinyu

src/cql2_lexer.l

@@ -100,6 +100,16 @@ INTERVAL|interval {
   return Cql2ParserBase::token::RPT;
 }
 
+"[" {
+  print("LSB", yytext);
+  return Cql2ParserBase::token::LSB;
+}
+
+"]" {
+  print("RSB", yytext);
+  return Cql2ParserBase::token::RSB;
+}
+
 "\"" {
   print("DQUOTE", yytext);
   return Cql2ParserBase::token::DQUOTE;

src/cql2_parser.y

@@ -84,7 +84,9 @@ void cql2cpp::Cql2ParserBase::error(const std::string& msg) {
 %token IS_NULL
 %token IS_NOT_NULL
 %token BETWEEN NOT_BETWEEN
-%token <char> LPT RPT COMMA  // ( ) ,
+%token <char> COMMA   // ,
+%token <char> LPT RPT // parentheses ( )
+%token <char> LSB RSB // square brackets [ ]
 %token CASEI ACCENTI
 %token SQUOTE DQUOTE
 %token TIMESTAMP DATE INTERVAL
@@ -297,8 +299,10 @@ arrayExpression:
   | function
 
 array:
-  LPT RPT { PL; $$ = MakeAstNode(Array, NullOp, std::vector<AstNodePtr>()); }
-  | LPT arrayList RPT { PL; $$ = $2; }
+  LPT RPT { PL; $$ = MakeAstNode(Array, NullOp, std::vector<AstNodePtr>()); } // TODO remove in future version
+  | LPT arrayList RPT { PL; $$ = $2; } // TODO remove in future version
+  | LSB RSB { PL; $$ = MakeAstNode(Array, NullOp, std::vector<AstNodePtr>()); }
+  | LSB arrayList RSB { PL; $$ = $2; }
 
 arrayList:
   arrayElement  { PL; $$ = MakeAstNode(Array, NullOp, std::vector({$1})); }

test/indoorjson/clause7_15.txt

@@ -0,0 +1 @@
+A_CONTAINS(layer:ids, ['layers-ca','layers-us'])

test/indoorjson/example79.txt

@@ -0,0 +1 @@
+A_CONTAINEDBY("values", ['a', 'b', 'c'])

test/indoorjson/example80.txt

@@ -0,0 +1 @@
+A_CONTAINS("values", ['a', 'b', 'c'])

test/indoorjson/example81.txt

@@ -0,0 +1 @@
+A_EQUALS(['a', TRUE, 1.0, 8], "values")

test/test_parse.cc

@@ -127,6 +127,10 @@ TEST_F(ParseTest, binlocations  ) { EXPECT_TRUE(Parse(case_name_)); }
 TEST_F(ParseTest, related_bins  ) { EXPECT_TRUE(Parse(case_name_)); }
 TEST_F(ParseTest, avg           ) { EXPECT_TRUE(Parse(case_name_)); }
 TEST_F(ParseTest, spatial       ) { EXPECT_TRUE(Parse(case_name_)); }
+TEST_F(ParseTest, clause7_15    ) { EXPECT_TRUE(Parse(case_name_)); }
+TEST_F(ParseTest, example79     ) { EXPECT_TRUE(Parse(case_name_)); }
+TEST_F(ParseTest, example80     ) { EXPECT_TRUE(Parse(case_name_)); }
+TEST_F(ParseTest, example81     ) { EXPECT_TRUE(Parse(case_name_)); }
 // TEST_F(ParseTest, labels        ) { EXPECT_TRUE(Parse(case_name_)); }  // standard unsupported
 
 TEST_F(ParseExampleTest, clause6_01) {EXPECT_TRUE(Parse(case_name_)); }