CQL sortby parsing, no semantics yet

diff --git a/src/cql.y b/src/cql.y
index c6151a2..25a4287 100644 (file)
--- a/src/cql.y
+++ b/src/cql.y
@@ -53,7 +53,7 @@
 %}
 
 %pure_parser
 %}
 
 %pure_parser

-%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT
+%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY

 
 %%
 
 
 %%
 

@@ -61,12 +61,20 @@ top: {
     $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
                            "cql.serverChoice", "=", 0);
     ((CQL_parser) parm)->top = 0;
     $$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
                            "cql.serverChoice", "=", 0);
     ((CQL_parser) parm)->top = 0;

-} cqlQuery1 {
+} cqlQuery1 sortby {

     cql_node_destroy($$.rel);
     ((CQL_parser) parm)->top = $2.cql; 
 }
 ;
 
     cql_node_destroy($$.rel);
     ((CQL_parser) parm)->top = $2.cql; 
 }
 ;
 

+sortby: /* empty */
+| SORTBY sortSpec;
+
+sortSpec: sortSpec singleSpec
+| singleSpec; 
+
+singleSpec: index modifiers ;
+

 cqlQuery1: cqlQuery
 | cqlQuery error {
     cql_node_destroy($1.cql);
 cqlQuery1: cqlQuery
 | cqlQuery error {
     cql_node_destroy($1.cql);

@@ -203,6 +211,7 @@ searchTerm:
 | OR
 | NOT
 | PROX
 | OR
 | NOT
 | PROX

+| SORTBY

 ;
 
 %%
 ;
 
 %%

@@ -358,6 +367,11 @@ int yylex(YYSTYPE *lval, void *vp)
            lval->buf = "prox";
            return PROX;
        }
            lval->buf = "prox";
            return PROX;
        }

+       if (!cql_strcmp(lval->buf, "sortby"))
+       {
+           lval->buf = "sortby";
+           return SORTBY;
+       }

        if (!cql_strcmp(lval->buf, "all"))
            relation_like = 1;
        if (!cql_strcmp(lval->buf, "any"))
        if (!cql_strcmp(lval->buf, "all"))
            relation_like = 1;
        if (!cql_strcmp(lval->buf, "any"))