is number -> is numeric

Author: feodor

Diff for: expected/jsquery.out

@@ -959,7 +959,7 @@ LINE 1: select 'a\r = x"\\abcd"'::jsquery AS err;
                ^
 DETAIL:  syntax error, unexpected STRING_P, expecting $end at or near """
 --IS
-select  'as IS boolean | as is ARRAY | as is ObJect | as is Number | as is string'::jsquery;
+select  'as IS boolean | as is ARRAY | as is ObJect | as is Numeric | as is string'::jsquery;
                                           jsquery                                           
 --------------------------------------------------------------------------------------------
  (((("as" IS BOOLEAN | "as" IS ARRAY) | "as" IS OBJECT) | "as" IS NUMBER) | "as" IS STRING)
@@ -971,13 +971,13 @@ select '{"as": "xxx"}' @@ 'as IS string'::jsquery;
  t
 (1 row)
 
-select '{"as": "xxx"}' @@ 'as IS boolean | as is ARRAY | as is ObJect | as is Number'::jsquery;
+select '{"as": "xxx"}' @@ 'as IS boolean | as is ARRAY | as is ObJect | as is Numeric'::jsquery;
  ?column? 
 ----------
  f
 (1 row)
 
-select '{"as": 5}' @@ 'as is Number'::jsquery;
+select '{"as": 5}' @@ 'as is Numeric'::jsquery;
  ?column? 
 ----------
  t
@@ -1019,7 +1019,7 @@ select '"xxx"' @@ '$ IS string'::jsquery;
  t
 (1 row)
 
-select '"xxx"' @@ '$ IS number'::jsquery;
+select '"xxx"' @@ '$ IS numeric'::jsquery;
  ?column? 
 ----------
  f

Diff for: jsquery_gram.y

@@ -198,9 +198,9 @@ makeItemList(List *list) {
 	JsQueryParseItem		*value;
 }
 
-%token	<str>		IN_P IS_P NULL_P TRUE_P ARRAY_P
-					FALSE_P NUMBER_P OBJECT_P TEXT_P 
-					BOOLEAN_P
+%token	<str>		IN_P IS_P NULL_P TRUE_P ARRAY_T
+					FALSE_P NUMERIC_T OBJECT_T STRING_T 
+					BOOLEAN_T
 
 %token	<str>		STRING_P NUMERIC_P
 
@@ -233,12 +233,12 @@ scalar_value:
 	| IS_P							{ $$ = makeItemString(&$1); }
 	| NULL_P						{ $$ = makeItemString(NULL); }
 	| TRUE_P						{ $$ = makeItemBool(true); }
-	| ARRAY_P						{ $$ = makeItemString(&$1); }
+	| ARRAY_T						{ $$ = makeItemString(&$1); }
 	| FALSE_P						{ $$ = makeItemBool(false); }
-	| NUMBER_P						{ $$ = makeItemString(&$1); }
-	| OBJECT_P						{ $$ = makeItemString(&$1); }
-	| TEXT_P						{ $$ = makeItemString(&$1); }
-	| BOOLEAN_P						{ $$ = makeItemString(&$1); }
+	| NUMERIC_T						{ $$ = makeItemString(&$1); }
+	| OBJECT_T						{ $$ = makeItemString(&$1); }
+	| STRING_T						{ $$ = makeItemString(&$1); }
+	| BOOLEAN_T						{ $$ = makeItemString(&$1); }
 	| NUMERIC_P						{ $$ = makeItemNumeric(&$1); }
 	;
 
@@ -259,11 +259,11 @@ right_expr:
 	| '@' '>' array					{ $$ = makeItemUnary(jqiContains, $3); } 
 	| '<' '@' array					{ $$ = makeItemUnary(jqiContained, $3); } 
 	| '&' '&' array					{ $$ = makeItemUnary(jqiOverlap, $3); }
-	| IS_P ARRAY_P 					{ $$ = makeItemIs(jbvArray); }
-	| IS_P NUMBER_P 				{ $$ = makeItemIs(jbvNumeric); }
-	| IS_P OBJECT_P 				{ $$ = makeItemIs(jbvObject); }
-	| IS_P TEXT_P 					{ $$ = makeItemIs(jbvString); }
-	| IS_P BOOLEAN_P 				{ $$ = makeItemIs(jbvBool); }
+	| IS_P ARRAY_T 					{ $$ = makeItemIs(jbvArray); }
+	| IS_P NUMERIC_T 				{ $$ = makeItemIs(jbvNumeric); }
+	| IS_P OBJECT_T 				{ $$ = makeItemIs(jbvObject); }
+	| IS_P STRING_T 				{ $$ = makeItemIs(jbvString); }
+	| IS_P BOOLEAN_T 				{ $$ = makeItemIs(jbvBool); }
 	;
 
 expr:
@@ -284,12 +284,12 @@ key:
 	| IS_P							{ $$ = $1; }
 	| NULL_P						{ $$ = $1; }
 	| TRUE_P						{ $$ = $1; }
-	| ARRAY_P						{ $$ = $1; }
+	| ARRAY_T						{ $$ = $1; }
 	| FALSE_P						{ $$ = $1; }
-	| NUMBER_P						{ $$ = $1; }
-	| OBJECT_P						{ $$ = $1; }
-	| TEXT_P						{ $$ = $1; }
-	| BOOLEAN_P						{ $$ = $1; }
+	| NUMERIC_T						{ $$ = $1; }
+	| OBJECT_T						{ $$ = $1; }
+	| STRING_T						{ $$ = $1; }
+	| BOOLEAN_T						{ $$ = $1; }
 	| NUMERIC_P						{ $$ = $1; }
 	;
 

Diff for: jsquery_scan.l

@@ -201,12 +201,12 @@ static keyword keywords[] = {
 	{ 2, false,	IS_P,		"is"},
 	{ 4, true,	NULL_P,		"null"},
 	{ 4, true,	TRUE_P,		"true"},
-	{ 5, false,	ARRAY_P,	"array"},
+	{ 5, false,	ARRAY_T,	"array"},
 	{ 5, true,	FALSE_P,	"false"},
-	{ 6, false,	NUMBER_P,	"number"},
-	{ 6, false,	OBJECT_P,	"object"},
-	{ 6, false,	TEXT_P,		"string"},
-	{ 7, false,	BOOLEAN_P,	"boolean"},
+	{ 6, false,	OBJECT_T,	"object"},
+	{ 6, false,	STRING_T,	"string"},
+	{ 7, false,	BOOLEAN_T,	"boolean"},
+	{ 7, false,	NUMERIC_T,	"numeric"}
 };
 
 static int

Diff for: sql/jsquery.sql

@@ -195,17 +195,17 @@ select 'a\r = x"\\abcd"'::jsquery AS err;
 
 --IS
 
-select  'as IS boolean | as is ARRAY | as is ObJect | as is Number | as is string'::jsquery;
+select  'as IS boolean | as is ARRAY | as is ObJect | as is Numeric | as is string'::jsquery;
 select '{"as": "xxx"}' @@ 'as IS string'::jsquery;
-select '{"as": "xxx"}' @@ 'as IS boolean | as is ARRAY | as is ObJect | as is Number'::jsquery;
-select '{"as": 5}' @@ 'as is Number'::jsquery;
+select '{"as": "xxx"}' @@ 'as IS boolean | as is ARRAY | as is ObJect | as is Numeric'::jsquery;
+select '{"as": 5}' @@ 'as is Numeric'::jsquery;
 select '{"as": true}' @@ 'as is boolean'::jsquery;
 select '{"as": false}' @@ 'as is boolean'::jsquery;
 select '{"as": "false"}' @@ 'as is boolean'::jsquery;
 select '["xxx"]' @@ '$ IS array'::jsquery;
 select '{"as": false}' @@ '$ IS object'::jsquery;
 select '"xxx"' @@ '$ IS string'::jsquery;
-select '"xxx"' @@ '$ IS number'::jsquery;
+select '"xxx"' @@ '$ IS numeric'::jsquery;
 
 ---table and index