libidav/davqlparser.c

Thu, 28 May 2015 12:22:55 +0200

author
Mike Becker <universe@uap-core.de>
date
Thu, 28 May 2015 12:22:55 +0200
changeset 115
5744a3dee766
parent 114
943548492a47
child 116
44ffe073b5e3
permissions
-rw-r--r--

completed logical expression parser - NEED TO TEST A LOT!

76
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2015 Olaf Wintermann. All rights reserved.
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "davqlparser.h"
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
30 #include <ucx/utils.h>
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
31 #include <string.h>
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
32 #include <stdio.h>
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
33 #include <ctype.h>
76
4c48ce3b9045 structure draft for DavQL statements
Mike Becker <universe@uap-core.de>
parents:
diff changeset
34
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
35 #define sfmtarg(s) ((int)(s).length), (s).ptr
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
36
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
37 // ------------------------------------------------------------------------
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
38 // D E B U G E R
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
39 // ------------------------------------------------------------------------
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
40
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
41 static const char* _map_querytype(davqltype_t type) {
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
42 switch(type) {
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
43 case DAVQL_ERROR: return "ERROR";
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
44 case DAVQL_GET: return "GET";
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
45 case DAVQL_SET: return "SET";
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
46 default: return "unknown";
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
47 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
48 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
49
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
50 static const char* _map_exprtype(davqlexprtype_t type) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
51 switch(type) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
52 case DAVQL_UNDEFINED_TYPE: return "undefined";
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
53 case DAVQL_NUMBER: return "NUMBER";
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
54 case DAVQL_STRING: return "STRING";
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
55 case DAVQL_TIMESTAMP: return "TIMESTAMP";
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
56 case DAVQL_IDENTIFIER: return "IDENTIFIER";
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
57 case DAVQL_UNARY: return "UNARY";
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
58 case DAVQL_BINARY: return "BINARY";
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
59 case DAVQL_LOGICAL: return "LOGICAL";
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
60 case DAVQL_FUNCCALL: return "FUNCCALL";
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
61 default: return "unknown";
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
62 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
63 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
64
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
65 static const char* _map_specialfield(int info) {
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
66 switch(info) {
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
67 case 0: return "";
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
68 case 1: return "with wildcard";
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
69 case 2: return "(resource data only)";
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
70 default: return "with mysterious identifier";
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
71 }
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
72 }
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
73
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
74 static const char* _map_operator(davqloperator_t op) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
75 // don't use string array, because enum values may change
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
76 switch(op) {
83
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
77 case DAVQL_NOOP: return "no operator";
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
78 case DAVQL_CALL: return "function call"; case DAVQL_ARGLIST: return ",";
83
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
79 case DAVQL_ADD: return "+"; case DAVQL_SUB: return "-";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
80 case DAVQL_MUL: return "*"; case DAVQL_DIV: return "/";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
81 case DAVQL_AND: return "&"; case DAVQL_OR: return "|";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
82 case DAVQL_XOR: return "^"; case DAVQL_NEG: return "~";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
83 case DAVQL_NOT: return "NOT"; case DAVQL_LAND: return "AND";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
84 case DAVQL_LOR: return "OR"; case DAVQL_LXOR: return "XOR";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
85 case DAVQL_EQ: return "="; case DAVQL_NEQ: return "!=";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
86 case DAVQL_LT: return "<"; case DAVQL_GT: return ">";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
87 case DAVQL_LE: return "<="; case DAVQL_GE: return ">=";
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
88 case DAVQL_LIKE: return "LIKE"; case DAVQL_UNLIKE: return "UNLIKE";
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
89 default: return "unknown";
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
90 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
91 }
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
92
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
93 static void dav_debug_ql_fnames_print(DavQLStatement *stmt) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
94 if (stmt->fields) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
95 printf("Field names: ");
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
96 UCX_FOREACH(field, stmt->fields) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
97 DavQLField *f = field->data;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
98 printf("%.*s, ", sfmtarg(f->name));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
99 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
100 printf("\b\b \b\b\n");
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
101 }
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
102 }
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
103
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
104 static void dav_debug_ql_stmt_print(DavQLStatement *stmt) {
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
105 // Basic information
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
106 size_t fieldcount = ucx_list_size(stmt->fields);
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
107 int specialfield = 0;
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
108 if (stmt->fields) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
109 DavQLField* firstfield = (DavQLField*)stmt->fields->data;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
110 if (firstfield->expr->type == DAVQL_IDENTIFIER) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
111 switch (firstfield->expr->srctext.ptr[0]) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
112 case '*': specialfield = 1; break;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
113 case '-': specialfield = 2; break;
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
114 }
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
115 }
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
116 }
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
117 if (specialfield) {
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
118 fieldcount--;
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
119 }
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
120 printf("Statement: %.*s\nType: %s\nField count: %zu %s\n",
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
121 sfmtarg(stmt->srctext),
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
122 _map_querytype(stmt->type),
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
123 fieldcount,
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
124 _map_specialfield(specialfield));
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
125
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
126 dav_debug_ql_fnames_print(stmt);
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
127 printf("Path: %.*s\nHas where clause: %s\n",
87
ed21d95984bb removed DavQLExpression type for path (since it always is an identifier)
Mike Becker <universe@uap-core.de>
parents: 86
diff changeset
128 sfmtarg(stmt->path),
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
129 stmt->where ? "yes" : "no");
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
130
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
131 // WITH attributes
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
132 if (stmt->depth == DAV_DEPTH_INFINITY) {
85
0ab1cf261a44 improved grammar + changed depth default, type and added infinity
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
133 printf("Depth: infinity\n");
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
134 } else if (stmt->depth == DAV_DEPTH_PLACEHOLDER) {
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
135 printf("Depth: placeholder\n");
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
136 } else {
85
0ab1cf261a44 improved grammar + changed depth default, type and added infinity
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
137 printf("Depth: %d\n", stmt->depth);
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
138 }
95
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
139
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
140 // order by clause
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
141 printf("Order by: ");
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
142 if (stmt->orderby) {
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
143 UCX_FOREACH(crit, stmt->orderby) {
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
144 DavQLOrderCriterion *critdata = crit->data;
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
145 printf("%.*s %s%s", sfmtarg(critdata->column->srctext),
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
146 critdata->descending ? "desc" : "asc",
95
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
147 crit->next ? ", " : "\n");
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
148 }
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
149 } else {
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
150 printf("nothing\n");
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
151 }
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
152
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
153 // error messages
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
154 if (stmt->errorcode) {
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
155 printf("\nError code: %d\nError: %s\n",
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
156 stmt->errorcode, stmt->errormessage);
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
157 }
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
158 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
159
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
160 static int dav_debug_ql_expr_selected(DavQLExpression *expr) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
161 if (!expr) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
162 printf("Currently no expression selected.\n");
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
163 return 0;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
164 } else {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
165 return 1;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
166 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
167 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
168
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
169 static void dav_debug_ql_expr_print(DavQLExpression *expr) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
170 if (dav_debug_ql_expr_selected(expr)) {
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
171 sstr_t empty = ST("(empty)");
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
172 printf(
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
173 "Text: %.*s\nType: %s\nOperator: %s\n",
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
174 sfmtarg(expr->srctext),
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
175 _map_exprtype(expr->type),
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
176 _map_operator(expr->op));
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
177 if (expr->left || expr->right) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
178 printf("Left hand: %.*s\nRight hand: %.*s\n",
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
179 sfmtarg(expr->left?expr->left->srctext:empty),
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
180 sfmtarg(expr->right?expr->right->srctext:empty));
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
181 }
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
182 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
183 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
184
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
185 static void dav_debug_ql_tree_print(DavQLExpression *expr, int depth) {
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
186 if (expr) {
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
187 if (expr->left) {
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
188 printf("%*c%s\n", depth, ' ', _map_operator(expr->op));
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
189 dav_debug_ql_tree_print(expr->left, depth+1);
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
190 dav_debug_ql_tree_print(expr->right, depth+1);
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
191 } else if (expr->type == DAVQL_UNARY) {
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
192 printf("%*c%s %.*s\n", depth, ' ', _map_operator(expr->op),
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
193 sfmtarg(expr->srctext));
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
194 } else {
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
195 printf("%*c%.*s\n", depth, ' ', sfmtarg(expr->srctext));
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
196 }
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
197 }
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
198 }
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
199
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
200 #define DQLD_CMD_Q 0
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
201 #define DQLD_CMD_PS 1
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
202 #define DQLD_CMD_PE 2
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
203 #define DQLD_CMD_PF 3
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
204 #define DQLD_CMD_PT 4
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
205 #define DQLD_CMD_F 10
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
206 #define DQLD_CMD_W 11
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
207 #define DQLD_CMD_O 12
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
208 #define DQLD_CMD_L 21
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
209 #define DQLD_CMD_R 22
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
210 #define DQLD_CMD_N 23
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
211 #define DQLD_CMD_P 24
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
212 #define DQLD_CMD_H 100
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
213
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
214 static int dav_debug_ql_command() {
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
215 printf("> ");
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
216
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
217 char buffer[8];
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
218 fgets(buffer, 8, stdin);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
219 // discard remaining chars
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
220 if (!strchr(buffer, '\n')) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
221 int chr;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
222 while ((chr = fgetc(stdin) != '\n') && chr != EOF);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
223 }
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
224
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
225 if (!strcmp(buffer, "q\n")) {
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
226 return DQLD_CMD_Q;
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
227 } else if (!strcmp(buffer, "ps\n")) {
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
228 return DQLD_CMD_PS;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
229 } else if (!strcmp(buffer, "pe\n")) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
230 return DQLD_CMD_PE;
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
231 } else if (!strcmp(buffer, "pf\n")) {
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
232 return DQLD_CMD_PF;
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
233 } else if (!strcmp(buffer, "pt\n")) {
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
234 return DQLD_CMD_PT;
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
235 } else if (!strcmp(buffer, "l\n")) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
236 return DQLD_CMD_L;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
237 } else if (!strcmp(buffer, "r\n")) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
238 return DQLD_CMD_R;
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
239 } else if (!strcmp(buffer, "h\n")) {
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
240 return DQLD_CMD_H;
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
241 } else if (!strcmp(buffer, "f\n")) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
242 return DQLD_CMD_F;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
243 } else if (!strcmp(buffer, "w\n")) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
244 return DQLD_CMD_W;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
245 } else if (!strcmp(buffer, "o\n")) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
246 return DQLD_CMD_O;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
247 } else if (!strcmp(buffer, "n\n")) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
248 return DQLD_CMD_N;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
249 } else if (!strcmp(buffer, "p\n")) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
250 return DQLD_CMD_P;
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
251 } else {
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
252 return -1;
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
253 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
254 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
255
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
256 void dav_debug_statement(DavQLStatement *stmt) {
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
257 if (!stmt) {
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
258 fprintf(stderr, "Debug DavQLStatement failed: null pointer");
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
259 return;
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
260 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
261
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
262 printf("Starting DavQL debugger (type 'h' for help)...\n\n");
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
263 dav_debug_ql_stmt_print(stmt);
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
264
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
265 if (stmt->errorcode) {
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
266 return;
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
267 }
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
268
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
269 DavQLExpression *examineexpr = NULL;
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
270 UcxList *examineelem = NULL;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
271 int examineclause = 0;
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
272
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
273 while(1) {
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
274 int cmd = dav_debug_ql_command();
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
275 switch (cmd) {
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
276 case DQLD_CMD_Q: return;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
277 case DQLD_CMD_PS: dav_debug_ql_stmt_print(stmt); break;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
278 case DQLD_CMD_PE: dav_debug_ql_expr_print(examineexpr); break;
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
279 case DQLD_CMD_PT: dav_debug_ql_tree_print(examineexpr, 1); break;
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
280 case DQLD_CMD_PF: dav_debug_ql_fnames_print(stmt); break;
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
281 case DQLD_CMD_F:
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
282 if (examineclause != DQLD_CMD_F) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
283 examineclause = DQLD_CMD_F;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
284 examineelem = stmt->fields;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
285 examineexpr = stmt->fields ?
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
286 ((DavQLField*)stmt->fields->data)->expr : NULL;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
287 dav_debug_ql_expr_print(examineexpr);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
288 }
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
289 break;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
290 case DQLD_CMD_W:
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
291 examineclause = 0; examineelem = NULL;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
292 examineexpr = stmt->where;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
293 dav_debug_ql_expr_print(examineexpr);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
294 break;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
295 case DQLD_CMD_O:
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
296 if (examineclause != DQLD_CMD_O) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
297 examineclause = DQLD_CMD_O;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
298 examineelem = stmt->orderby;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
299 examineexpr = stmt->orderby ?
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
300 ((DavQLOrderCriterion*)stmt->orderby->data)->column : NULL;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
301 dav_debug_ql_expr_print(examineexpr);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
302 }
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
303 break;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
304 case DQLD_CMD_N:
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
305 case DQLD_CMD_P:
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
306 if (examineelem) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
307 UcxList *newelem = (cmd == DQLD_CMD_N ?
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
308 examineelem->next : examineelem->prev);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
309 if (newelem) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
310 examineelem = newelem;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
311 if (examineclause == DQLD_CMD_O) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
312 examineexpr = ((DavQLOrderCriterion*)
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
313 examineelem->data)->column;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
314 } else if (examineclause == DQLD_CMD_F) {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
315 examineexpr = ((DavQLField*)examineelem->data)->expr;
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
316 } else {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
317 printf("Examining unknown clause type.");
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
318 }
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
319 dav_debug_ql_expr_print(examineexpr);
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
320 } else {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
321 printf("Reached end of list.\n");
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
322 }
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
323 } else {
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
324 printf("Currently not examining an expression list.\n");
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
325 }
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
326 break;
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
327 case DQLD_CMD_L:
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
328 if (dav_debug_ql_expr_selected(examineexpr)) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
329 if (examineexpr->left) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
330 examineexpr = examineexpr->left;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
331 dav_debug_ql_expr_print(examineexpr);
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
332 } else {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
333 printf("There is no left subtree.\n");
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
334 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
335 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
336 break;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
337 case DQLD_CMD_R:
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
338 if (dav_debug_ql_expr_selected(examineexpr)) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
339 if (examineexpr->right) {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
340 examineexpr = examineexpr->right;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
341 dav_debug_ql_expr_print(examineexpr);
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
342 } else {
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
343 printf("There is no right subtree.\n");
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
344 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
345 }
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
346 break;
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
347 case DQLD_CMD_H:
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
348 printf(
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
349 "\nCommands:\n"
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
350 "ps: print statement information\n"
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
351 "o: examine order by clause\n"
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
352 "f: examine field list\n"
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
353 "pf: print field names\n"
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
354 "w: examine where clause\n"
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
355 "n: examine next expression "
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
356 "(in order by clause or field list)\n"
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
357 "p: examine previous expression "
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
358 "(in order by clause or field list)\n"
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
359 "q: quit\n\n"
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
360 "\nExpression examination:\n"
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
361 "pe: print expression information\n"
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
362 "pt: print full syntax tree of current (sub-)expression\n"
80
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
363 "l: enter left subtree\n"
a2832c054c98 added path examination to debugger + changed field names of expression subtrees
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
364 "r: enter right subtree\n");
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
365 break;
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
366 default: printf("unknown command\n");
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
367 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
368 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
369 }
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
370
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
371 // ------------------------------------------------------------------------
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
372 // P A R S E R
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
373 // ------------------------------------------------------------------------
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
374
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
375 #define _error_context "(%.*s[->]%.*s%.*s)"
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
376 #define _error_invalid "invalid statement"
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
377 #define _error_unhandled "unhandled error " _error_context
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
378 #define _error_unexpected_token "unexpected token " _error_context
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
379 #define _error_invalid_token "invalid token " _error_context
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
380 #define _error_missing_path "expected path " _error_context
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
381 #define _error_missing_from "expecting FROM keyword " _error_context
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
382 #define _error_missing_by "expecting BY keyword " _error_context
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
383 #define _error_missing_as "expecting alias ('as <identifier>') " _error_context
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
384 #define _error_missing_identifier "expecting identifier " _error_context
111
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
385 #define _error_missing_par "missing closed parenthesis " _error_context
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
386 #define _error_invalid_depth "invalid depth " _error_context
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
387 #define _error_missing_expr "missing expression " _error_context
108
0199f13c7fe2 fixed parsing of binary expressions did not yield the correct type
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
388 #define _error_invalid_expr "invalid expression " _error_context
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
389 #define _error_invalid_unary_op "invalid unary operator " _error_context
115
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
390 #define _error_invalid_logical_op "invalid logical operator " _error_context
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
391 #define _error_invalid_fmtspec "invalid format specifier " _error_context
115
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
392 #define _error_invalid_string "string expected " _error_context
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
393
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
394 #define token_sstr(token) (((DavQLToken*)(token)->data)->value)
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
395
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
396 static void dav_error_in_context(int errorcode, const char *errormsg,
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
397 DavQLStatement *stmt, UcxList *token) {
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
398
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
399 // we try to achieve two things: get as many information as possible
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
400 // and recover the concrete source string (and not the token strings)
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
401 sstr_t emptystring = ST("");
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
402 sstr_t prev = token->prev ? (token->prev->prev ?
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
403 token_sstr(token->prev->prev) : token_sstr(token->prev))
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
404 : emptystring;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
405 sstr_t tokenstr = token_sstr(token);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
406 sstr_t next = token->next ? (token->next->next ?
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
407 token_sstr(token->next->next) : token_sstr(token->next))
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
408 : emptystring;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
409
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
410 int lp = prev.length == 0 ? 0 : tokenstr.ptr-prev.ptr;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
411 char *pn = tokenstr.ptr + tokenstr.length;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
412 int ln = next.ptr+next.length - pn;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
413
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
414 stmt->errorcode = errorcode;
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
415 stmt->errormessage = ucx_sprintf(errormsg,
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
416 lp, prev.ptr,
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
417 sfmtarg(tokenstr),
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
418 ln, pn).ptr;
96
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
419 }
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
420
896022673e0e special path parser + typed literals + order by parser + grammar changes
Mike Becker <universe@uap-core.de>
parents: 95
diff changeset
421 // special symbols are single tokens - the % sign MUST NOT be a special symbol
93
2176ffbf1346 added special symbol list to tokenizer
Mike Becker <universe@uap-core.de>
parents: 92
diff changeset
422 static const char *special_token_symbols = ",()+-*/&|^~=!<>";
2176ffbf1346 added special symbol list to tokenizer
Mike Becker <universe@uap-core.de>
parents: 92
diff changeset
423
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
424 static _Bool iskeyword(DavQLToken *token) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
425 sstr_t keywords[] = {ST("get"), ST("set"), ST("from"), ST("at"), ST("as"),
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
426 ST("where"), ST("with"), ST("order"), ST("by"), ST("asc"), ST("desc")
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
427 };
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
428 for (int i = 0 ; i < sizeof(keywords)/sizeof(sstr_t) ; i++) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
429 if (!sstrcasecmp(token->value, keywords[i])) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
430 return 1;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
431 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
432 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
433 return 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
434 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
435
115
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
436 static _Bool islongoperator(DavQLToken *token) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
437 sstr_t operators[] = {ST("and"), ST("or"), ST("not"), ST("xor"),
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
438 ST("like"), ST("unlike")
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
439 };
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
440 for (int i = 0 ; i < sizeof(operators)/sizeof(sstr_t) ; i++) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
441 if (!sstrcasecmp(token->value, operators[i])) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
442 return 1;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
443 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
444 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
445 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
446 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
447
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
448 static UcxList* dav_parse_add_token(UcxList *tokenlist, DavQLToken *token) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
449
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
450 // determine token class (order of if-statements is very important!)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
451 char firstchar = token->value.ptr[0];
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
452
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
453 if (isdigit(firstchar)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
454 token->tokenclass = DAVQL_TOKEN_NUMBER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
455 } else if (firstchar == '%') {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
456 token->tokenclass = DAVQL_TOKEN_FMTSPEC;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
457 } else if (token->value.length == 1) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
458 switch (firstchar) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
459 case '(': token->tokenclass = DAVQL_TOKEN_OPENP; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
460 case ')': token->tokenclass = DAVQL_TOKEN_CLOSEP; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
461 case ',': token->tokenclass = DAVQL_TOKEN_COMMA; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
462 case '=': token->tokenclass = DAVQL_TOKEN_EQ; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
463 case '<': token->tokenclass = DAVQL_TOKEN_LT; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
464 case '>': token->tokenclass = DAVQL_TOKEN_GT; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
465 case '!': token->tokenclass = DAVQL_TOKEN_EXCLAIM; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
466 default:
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
467 token->tokenclass = strchr(special_token_symbols, firstchar) ?
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
468 DAVQL_TOKEN_OPERATOR : DAVQL_TOKEN_IDENTIFIER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
469 }
115
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
470 } else if (islongoperator(token)) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
471 token->tokenclass = DAVQL_TOKEN_OPERATOR;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
472 } else if (firstchar == '\'') {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
473 token->tokenclass = DAVQL_TOKEN_STRING;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
474 } else if (firstchar == '`') {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
475 token->tokenclass = DAVQL_TOKEN_IDENTIFIER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
476 } else if (iskeyword(token)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
477 token->tokenclass = DAVQL_TOKEN_KEYWORD;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
478 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
479 token->tokenclass = DAVQL_TOKEN_IDENTIFIER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
480 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
481
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
482 // remove quotes (extreme cool feature)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
483 if (token->tokenclass == DAVQL_TOKEN_STRING ||
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
484 (token->tokenclass == DAVQL_TOKEN_IDENTIFIER && firstchar == '`')) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
485
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
486 char lastchar = token->value.ptr[token->value.length-1];
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
487 if (firstchar == lastchar) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
488 token->value.ptr++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
489 token->value.length -= 2;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
490 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
491 token->tokenclass = DAVQL_TOKEN_INVALID;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
492 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
493 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
494
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
495
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
496 return ucx_list_append(tokenlist, token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
497 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
498
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
499 static UcxList* dav_parse_tokenize(sstr_t src) {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
500 UcxList *tokens = NULL;
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
501
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
502 DavQLToken *token = NULL;
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
503 char insequence = '\0';
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
504 for (size_t i = 0 ; i < src.length ; i++) {
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
505 // quoted strings / identifiers are a single token
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
506 if (src.ptr[i] == '\'' || src.ptr[i] == '`') {
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
507 if (src.ptr[i] == insequence) {
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
508 // add quoted token to list
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
509 token->value.length++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
510 tokens = dav_parse_add_token(tokens, token);
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
511 token = NULL;
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
512 insequence = '\0';
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
513 } else if (insequence == '\0') {
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
514 insequence = src.ptr[i];
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
515 // always create new token for quoted strings
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
516 if (token) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
517 tokens = dav_parse_add_token(tokens, token);
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
518 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
519 token = malloc(sizeof(DavQLToken));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
520 token->value.ptr = src.ptr + i;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
521 token->value.length = 1;
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
522 } else {
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
523 // add other kind of quotes to token
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
524 token->value.length++;
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
525 }
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
526 } else if (insequence) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
527 token->value.length++;
88
4d6b03bd7034 tokenizer now correctly handles quoted tokens
Mike Becker <universe@uap-core.de>
parents: 87
diff changeset
528 } else if (isspace(src.ptr[i])) {
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
529 // add token before spaces to list (if any)
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
530 if (token) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
531 tokens = dav_parse_add_token(tokens, token);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
532 token = NULL;
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
533 }
93
2176ffbf1346 added special symbol list to tokenizer
Mike Becker <universe@uap-core.de>
parents: 92
diff changeset
534 } else if (strchr(special_token_symbols, src.ptr[i])) {
2176ffbf1346 added special symbol list to tokenizer
Mike Becker <universe@uap-core.de>
parents: 92
diff changeset
535 // add token before special symbol to list (if any)
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
536 if (token) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
537 tokens = dav_parse_add_token(tokens, token);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
538 token = NULL;
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
539 }
93
2176ffbf1346 added special symbol list to tokenizer
Mike Becker <universe@uap-core.de>
parents: 92
diff changeset
540 // add special symbol as single token to list
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
541 token = malloc(sizeof(DavQLToken));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
542 token->value.ptr = src.ptr + i;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
543 token->value.length = 1;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
544 tokens = dav_parse_add_token(tokens, token);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
545 // set tokenizer ready to read more tokens
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
546 token = NULL;
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
547 } else {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
548 // if this is a new token, create memory for it
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
549 if (!token) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
550 token = malloc(sizeof(DavQLToken));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
551 token->value.ptr = src.ptr + i;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
552 token->value.length = 0;
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
553 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
554 // extend token length when reading more bytes
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
555 token->value.length++;
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
556 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
557 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
558
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
559 if (token) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
560 tokens = dav_parse_add_token(tokens, token);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
561 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
562
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
563 return tokens;
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
564 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
565
87
ed21d95984bb removed DavQLExpression type for path (since it always is an identifier)
Mike Becker <universe@uap-core.de>
parents: 86
diff changeset
566 static void dav_free_expression(DavQLExpression *expr) {
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
567 if (expr) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
568 if (expr->left) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
569 dav_free_expression(expr->left);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
570 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
571 if (expr->right) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
572 dav_free_expression(expr->right);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
573 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
574 free(expr);
87
ed21d95984bb removed DavQLExpression type for path (since it always is an identifier)
Mike Becker <universe@uap-core.de>
parents: 86
diff changeset
575 }
ed21d95984bb removed DavQLExpression type for path (since it always is an identifier)
Mike Becker <universe@uap-core.de>
parents: 86
diff changeset
576 }
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
577
99
579238097973 fieldlist parser can now parse fields with alias
Mike Becker <universe@uap-core.de>
parents: 98
diff changeset
578 static void dav_free_field(DavQLField *field) {
579238097973 fieldlist parser can now parse fields with alias
Mike Becker <universe@uap-core.de>
parents: 98
diff changeset
579 dav_free_expression(field->expr);
579238097973 fieldlist parser can now parse fields with alias
Mike Becker <universe@uap-core.de>
parents: 98
diff changeset
580 free(field);
579238097973 fieldlist parser can now parse fields with alias
Mike Becker <universe@uap-core.de>
parents: 98
diff changeset
581 }
579238097973 fieldlist parser can now parse fields with alias
Mike Becker <universe@uap-core.de>
parents: 98
diff changeset
582
95
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
583 static void dav_free_order_criterion(DavQLOrderCriterion *crit) {
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
584 if (crit->column) { // do it null-safe though column is expected to be set
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
585 dav_free_expression(crit->column);
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
586 }
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
587 free(crit);
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
588 }
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
589
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
590 #define token_is(token, expectedclass) (token && \
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
591 (((DavQLToken*)(token)->data)->tokenclass == expectedclass))
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
592
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
593 #define tokenvalue_is(token, expectedvalue) (token && \
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
594 !sstrcasecmp(((DavQLToken*)(token)->data)->value, S(expectedvalue)))
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
595
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
596 typedef int(*exprparser_f)(DavQLStatement*,UcxList*,DavQLExpression*);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
597
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
598 static int dav_parse_binary_expr(DavQLStatement* stmt, UcxList* token,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
599 DavQLExpression* expr, exprparser_f parseL, char* opc, int* opv,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
600 exprparser_f parseR) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
601
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
602 if (!token) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
603 return 0;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
604 }
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
605
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
606 int total_consumed = 0, consumed;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
607
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
608 // save temporarily on stack (copy to heap later on)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
609 DavQLExpression left, right;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
610
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
611 // RULE: LEFT, [Operator, RIGHT]
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
612 memset(&left, 0, sizeof(DavQLExpression));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
613 consumed = parseL(stmt, token, &left);
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
614 if (!consumed || stmt->errorcode) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
615 return 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
616 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
617 total_consumed += consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
618 token = ucx_list_get(token, consumed);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
619
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
620 char *op;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
621 if (token_is(token, DAVQL_TOKEN_OPERATOR) &&
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
622 (op = strchr(opc, token_sstr(token).ptr[0]))) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
623 expr->op = opv[op-opc];
108
0199f13c7fe2 fixed parsing of binary expressions did not yield the correct type
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
624 expr->type = DAVQL_BINARY;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
625 total_consumed++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
626 token = token->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
627 memset(&right, 0, sizeof(DavQLExpression));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
628 consumed = parseR(stmt, token, &right);
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
629 if (stmt->errorcode) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
630 return 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
631 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
632 if (!consumed) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
633 dav_error_in_context(DAVQL_ERROR_MISSING_EXPR,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
634 _error_missing_expr, stmt, token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
635 return 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
636 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
637 total_consumed += consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
638 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
639
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
640 if (expr->op == DAVQL_NOOP) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
641 memcpy(expr, &left, sizeof(DavQLExpression));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
642 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
643 expr->left = malloc(sizeof(DavQLExpression));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
644 memcpy(expr->left, &left, sizeof(DavQLExpression));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
645 expr->right = malloc(sizeof(DavQLExpression));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
646 memcpy(expr->right, &right, sizeof(DavQLExpression));
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
647
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
648 expr->srctext.ptr = expr->left->srctext.ptr;
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
649 expr->srctext.length =
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
650 expr->right->srctext.ptr -
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
651 expr->left->srctext.ptr + expr->right->srctext.length;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
652 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
653
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
654 return total_consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
655 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
656
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
657 static int dav_parse_literal(DavQLStatement* stmt, UcxList* token,
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
658 DavQLExpression* expr) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
659
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
660 expr->srctext = token_sstr(token);
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
661 if (token_is(token, DAVQL_TOKEN_NUMBER)) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
662 expr->type = DAVQL_NUMBER;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
663 } else if (token_is(token, DAVQL_TOKEN_STRING)) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
664 expr->type = DAVQL_STRING;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
665 } else if (token_is(token, DAVQL_TOKEN_TIMESTAMP)) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
666 expr->type = DAVQL_TIMESTAMP;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
667 } else if (token_is(token, DAVQL_TOKEN_FMTSPEC)
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
668 && expr->srctext.length == 2) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
669 switch (expr->srctext.ptr[1]) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
670 case 'd': expr->type = DAVQL_NUMBER; break;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
671 case 's': expr->type = DAVQL_STRING; break;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
672 case 't': expr->type = DAVQL_TIMESTAMP; break;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
673 default:
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
674 dav_error_in_context(DAVQL_ERROR_INVALID_FMTSPEC,
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
675 _error_invalid_fmtspec, stmt, token);
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
676 return 0;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
677 }
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
678 } else {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
679 return 0;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
680 }
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
681
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
682 return 1;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
683 }
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
684
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
685 // forward declaration
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
686 static int dav_parse_expression(DavQLStatement* stmt, UcxList* token,
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
687 DavQLExpression* expr);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
688
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
689 static int dav_parse_arglist(DavQLStatement* stmt, UcxList* token,
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
690 DavQLExpression* expr) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
691
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
692 expr->srctext.ptr = token_sstr(token).ptr;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
693 expr->srctext.length = 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
694 expr->left = expr->right = NULL; // in case we fail, we want them to be sane
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
695
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
696 int total_consumed = 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
697
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
698 // RULE: Expression, {",", Expression};
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
699 DavQLExpression *arglist = expr;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
700 DavQLExpression arg;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
701 char *lastchar = expr->srctext.ptr;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
702 int consumed;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
703 do {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
704 memset(&arg, 0, sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
705 consumed = dav_parse_expression(stmt, token, &arg);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
706 if (consumed) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
707 lastchar = arg.srctext.ptr + arg.srctext.length;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
708 total_consumed += consumed;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
709 token = ucx_list_get(token, consumed);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
710 // look ahead for a comma
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
711 if (token_is(token, DAVQL_TOKEN_COMMA)) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
712 total_consumed++;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
713 token = token->next;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
714 /* we have more arguments, so put the current argument to the
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
715 * left subtree and create a new node to the right
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
716 */
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
717 arglist->left = malloc(sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
718 memcpy(arglist->left, &arg, sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
719 arglist->srctext.ptr = arg.srctext.ptr;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
720 arglist->op = DAVQL_ARGLIST;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
721 arglist->type = DAVQL_FUNCCALL;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
722 arglist->right = calloc(1, sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
723 arglist = arglist->right;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
724 } else {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
725 // this was the last argument, so write it to the current node
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
726 memcpy(arglist, &arg, sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
727 consumed = 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
728 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
729 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
730 } while (consumed && !stmt->errorcode);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
731
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
732 // recover source text
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
733 arglist = expr;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
734 while (arglist && arglist->type == DAVQL_FUNCCALL) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
735 arglist->srctext.length = lastchar - arglist->srctext.ptr;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
736 arglist = arglist->right;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
737 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
738
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
739 return total_consumed;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
740 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
741
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
742 static int dav_parse_funccall(DavQLStatement* stmt, UcxList* token,
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
743 DavQLExpression* expr) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
744
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
745 // RULE: Identifier, "(", ArgumentList, ")";
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
746 if (token_is(token, DAVQL_TOKEN_IDENTIFIER) &&
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
747 token_is(token->next, DAVQL_TOKEN_OPENP)) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
748
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
749 expr->type = DAVQL_FUNCCALL;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
750 expr->op = DAVQL_CALL;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
751
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
752 expr->left = calloc(1, sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
753 expr->left->type = DAVQL_IDENTIFIER;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
754 expr->left->srctext = token_sstr(token);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
755 expr->right = NULL;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
756
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
757 token = token->next->next;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
758
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
759 DavQLExpression arg;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
760 int argtokens = dav_parse_arglist(stmt, token, &arg);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
761 if (stmt->errorcode) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
762 // if an error occurred while parsing the arglist, return now
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
763 return 2;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
764 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
765 if (argtokens) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
766 token = ucx_list_get(token, argtokens);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
767 expr->right = malloc(sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
768 memcpy(expr->right, &arg, sizeof(DavQLExpression));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
769 } else {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
770 // arg list may be empty
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
771 expr->right = NULL;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
772 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
773
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
774 if (token_is(token, DAVQL_TOKEN_CLOSEP)) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
775 return 3 + argtokens;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
776 } else {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
777 dav_error_in_context(DAVQL_ERROR_MISSING_PAR, _error_missing_par,
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
778 stmt, token);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
779 return 2; // it MUST be a function call, but it is invalid
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
780 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
781 } else {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
782 return 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
783 }
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
784 }
111
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
785
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
786 static int dav_parse_unary_expr(DavQLStatement* stmt, UcxList* token,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
787 DavQLExpression* expr) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
788
111
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
789 UcxList *firsttoken = token; // save for srctext recovery
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
790
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
791 DavQLExpression* atom = expr;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
792 int total_consumed = 0;
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
793
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
794 // optional unary operator
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
795 if (token_is(token, DAVQL_TOKEN_OPERATOR)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
796 char *op = strchr("+-~", token_sstr(token).ptr[0]);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
797 if (op) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
798 expr->type = DAVQL_UNARY;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
799 switch (*op) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
800 case '+': expr->op = DAVQL_ADD; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
801 case '-': expr->op = DAVQL_SUB; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
802 case '~': expr->op = DAVQL_NEG; break;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
803 }
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
804 expr->left = calloc(1, sizeof(DavQLExpression));
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
805 atom = expr->left;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
806 total_consumed++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
807 token = token->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
808 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
809 dav_error_in_context(DAVQL_ERROR_INVALID_UNARY_OP,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
810 _error_invalid_unary_op, stmt, token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
811 return 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
812 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
813 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
814
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
815 // RULE: (ParExpression | AtomicExpression)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
816 if (token_is(token, DAVQL_TOKEN_OPENP)) {
111
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
817 token = token->next; total_consumed++;
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
818 // RULE: "(", Expression, ")"
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
819 int consumed = dav_parse_expression(stmt, token, atom);
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
820 if (stmt->errorcode) {
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
821 return 0;
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
822 }
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
823 if (!consumed) {
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
824 dav_error_in_context(DAVQL_ERROR_INVALID_EXPR,
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
825 _error_invalid_expr, stmt, token);
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
826 return 0;
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
827 }
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
828 token = ucx_list_get(token, consumed);
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
829 total_consumed += consumed;
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
830 if (token_is(token, DAVQL_TOKEN_CLOSEP)) {
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
831 token = token->next; total_consumed++;
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
832 } else {
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
833 dav_error_in_context(DAVQL_ERROR_MISSING_PAR,
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
834 _error_missing_par, stmt, token);
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
835 return 0;
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
836 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
837 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
838 // RULE: FunctionCall
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
839 int consumed = dav_parse_funccall(stmt, token, atom);
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
840 if (consumed) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
841 total_consumed += consumed;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
842 } else if (token_is(token, DAVQL_TOKEN_IDENTIFIER)) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
843 // RULE: Identifier
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
844 total_consumed++;
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
845 atom->type = DAVQL_IDENTIFIER;
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
846 atom->srctext = token_sstr(token);
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
847 } else {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
848 // RULE: Literal
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
849 total_consumed += dav_parse_literal(stmt, token, atom);
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
850 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
851 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
852
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
853 // recover source text
111
39f4c5fcaa60 parser for ParExpression
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
854 expr->srctext.ptr = token_sstr(firsttoken).ptr;
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
855 if (total_consumed > 0) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
856 sstr_t lasttoken =
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
857 token_sstr(ucx_list_get(firsttoken, total_consumed-1));
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
858 expr->srctext.length =
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
859 lasttoken.ptr - expr->srctext.ptr + lasttoken.length;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
860 } else {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
861 // the expression should not be used anyway, but we want to be safe
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
862 expr->srctext.length = 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
863 }
109
020a5b5aa510 added syntax tree display to debugger + expression parser saves source text in every node
Mike Becker <universe@uap-core.de>
parents: 108
diff changeset
864
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
865
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
866 return total_consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
867 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
868
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
869 static int dav_parse_bitexpr(DavQLStatement* stmt, UcxList* token,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
870 DavQLExpression* expr) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
871
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
872 return dav_parse_binary_expr(stmt, token, expr,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
873 dav_parse_unary_expr,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
874 "&|^", (int[]){DAVQL_AND, DAVQL_OR, DAVQL_XOR},
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
875 dav_parse_bitexpr);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
876 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
877
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
878 static int dav_parse_multexpr(DavQLStatement* stmt, UcxList* token,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
879 DavQLExpression* expr) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
880
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
881 return dav_parse_binary_expr(stmt, token, expr,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
882 dav_parse_bitexpr,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
883 "*/", (int[]){DAVQL_MUL, DAVQL_DIV},
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
884 dav_parse_multexpr);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
885 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
886
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
887 static int dav_parse_expression(DavQLStatement* stmt, UcxList* token,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
888 DavQLExpression* expr) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
889
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
890 return dav_parse_binary_expr(stmt, token, expr,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
891 dav_parse_multexpr,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
892 "+-", (int[]){DAVQL_ADD, DAVQL_SUB},
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
893 dav_parse_expression);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
894 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
895
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
896 static int dav_parse_named_field(DavQLStatement *stmt, UcxList *token,
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
897 DavQLField *field) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
898 int total_consumed = 0, consumed;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
899
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
900 // RULE: Expression, " as ", Identifier;
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
901 DavQLExpression *expr = calloc(1, sizeof(DavQLExpression));
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
902 consumed = dav_parse_expression(stmt, token, expr);
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
903 if (stmt->errorcode) {
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
904 dav_free_expression(expr);
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
905 return 0;
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
906 }
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
907 if (expr->type == DAVQL_UNDEFINED_TYPE) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
908 dav_free_expression(expr);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
909 dav_error_in_context(DAVQL_ERROR_INVALID_EXPR,
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
910 _error_invalid_expr, stmt, token);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
911 return 0;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
912 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
913
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
914 token = ucx_list_get(token, consumed);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
915 total_consumed += consumed;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
916
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
917 if (token_is(token, DAVQL_TOKEN_KEYWORD) && tokenvalue_is(token, "as")) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
918 token = token->next; total_consumed++;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
919 } else {
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
920 dav_free_expression(expr);
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
921 dav_error_in_context(DAVQL_ERROR_MISSING_TOKEN,
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
922 _error_missing_as, stmt, token);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
923 return 0;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
924 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
925
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
926 if (token_is(token, DAVQL_TOKEN_IDENTIFIER)) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
927 field->name = token_sstr(token);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
928 field->expr = expr;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
929 return total_consumed + 1;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
930 } else {
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
931 dav_free_expression(expr);
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
932 dav_error_in_context(DAVQL_ERROR_MISSING_TOKEN,
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
933 _error_missing_identifier, stmt, token);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
934 return 0;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
935 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
936 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
937
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
938 static int dav_parse_fieldlist(DavQLStatement *stmt, UcxList *token) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
939
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
940 // RULE: "-"
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
941 if (token_is(token, DAVQL_TOKEN_OPERATOR) && tokenvalue_is(token, "-")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
942 DavQLField *field = malloc(sizeof(DavQLField));
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
943 field->expr = calloc(1, sizeof(DavQLExpression));
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
944 field->expr->type = DAVQL_IDENTIFIER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
945 field->expr->srctext = field->name = token_sstr(token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
946 stmt->fields = ucx_list_append(stmt->fields, field);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
947 return 1;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
948 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
949
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
950 // RULE: "*", {",", NamedExpression}
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
951 if (token_is(token, DAVQL_TOKEN_OPERATOR) && tokenvalue_is(token, "*")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
952 DavQLField *field = malloc(sizeof(DavQLField));
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
953 field->expr = calloc(1, sizeof(DavQLExpression));
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
954 field->expr->type = DAVQL_IDENTIFIER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
955 field->expr->srctext = field->name = token_sstr(token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
956 stmt->fields = ucx_list_append(stmt->fields, field);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
957
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
958 int total_consumed = 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
959 int consumed = 1;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
960
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
961 do {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
962 token = ucx_list_get(token, consumed);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
963 total_consumed += consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
964
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
965 if (token_is(token, DAVQL_TOKEN_COMMA)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
966 total_consumed++; token = token->next;
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
967 DavQLField localfield;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
968 consumed = dav_parse_named_field(stmt, token, &localfield);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
969 if (!stmt->errorcode && consumed) {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
970 DavQLField *field = malloc(sizeof(DavQLField));
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
971 memcpy(field, &localfield, sizeof(DavQLField));
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
972 stmt->fields = ucx_list_append(stmt->fields, field);
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
973 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
974 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
975 consumed = 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
976 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
977 } while (consumed > 0);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
978
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
979 return total_consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
980 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
981
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
982 // RULE: FieldExpression, {",", FieldExpression}
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
983 {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
984 int total_consumed = 0, consumed;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
985 do {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
986 // RULE: NamedField | Identifier
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
987 DavQLField localfield;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
988 consumed = dav_parse_named_field(stmt, token, &localfield);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
989 if (consumed) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
990 DavQLField *field = malloc(sizeof(DavQLField));
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
991 memcpy(field, &localfield, sizeof(DavQLField));
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
992 stmt->fields = ucx_list_append(stmt->fields, field);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
993 token = ucx_list_get(token, consumed);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
994 total_consumed += consumed;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
995 } else if (token_is(token, DAVQL_TOKEN_IDENTIFIER)
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
996 // look ahead, if the field is JUST the identifier
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
997 && (token_is(token->next, DAVQL_TOKEN_COMMA) ||
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
998 tokenvalue_is(token->next, "from"))) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
999
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1000 DavQLField *field = malloc(sizeof(DavQLField));
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
1001 field->expr = calloc(1, sizeof(DavQLExpression));
113
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1002 field->expr->type = DAVQL_IDENTIFIER;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1003 field->expr->srctext = field->name = token_sstr(token);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1004 stmt->fields = ucx_list_append(stmt->fields, field);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1005
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1006 consumed = 1;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1007 total_consumed++;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1008 token = token->next;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1009
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1010 // we found a valid solution, so erase any errors
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1011 stmt->errorcode = 0;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1012 if (stmt->errormessage) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1013 free(stmt->errormessage);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1014 stmt->errormessage = NULL;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1015 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1016 } else {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1017 // dav_parse_named_field has already thrown a good error
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1018 consumed = 0;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1019 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1020
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1021 // field has been parsed, now try to get a comma
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1022 if (consumed) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1023 consumed = token_is(token, DAVQL_TOKEN_COMMA) ? 1 : 0;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1024 if (consumed) {
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1025 token = token->next;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1026 total_consumed++;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1027 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1028 }
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1029 } while (consumed);
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1030
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1031 return total_consumed;
412b06dc0162 completed field list parser + error messages do now provide more context information based on the source string
Mike Becker <universe@uap-core.de>
parents: 111
diff changeset
1032 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1033 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1034
115
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1035 // forward declaration
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1036 static int dav_parse_logical_expr(DavQLStatement *stmt, UcxList *token,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1037 DavQLExpression *expr);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1038
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1039 static int dav_parse_bool_prim(DavQLStatement *stmt, UcxList *token,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1040 DavQLExpression *expr) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1041
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1042 expr->type = DAVQL_LOGICAL;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1043
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1044 int total_consumed = 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1045
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1046 DavQLExpression bexpr;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1047 memset(&bexpr, 0, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1048 total_consumed = dav_parse_expression(stmt, token, &bexpr);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1049 if (!total_consumed || stmt->errorcode) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1050 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1051 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1052 token = ucx_list_get(token, total_consumed);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1053
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1054 UcxList* optok = token;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1055 // RULE: Expression, (" like " | " unlike "), String
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1056 if (token_is(optok, DAVQL_TOKEN_OPERATOR) && (tokenvalue_is(optok,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1057 "like") || tokenvalue_is(optok, "unlike"))) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1058
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1059 total_consumed++;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1060 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1061 if (token_is(token, DAVQL_TOKEN_STRING)) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1062 expr->op = tokenvalue_is(optok, "like") ?
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1063 DAVQL_LIKE : DAVQL_UNLIKE;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1064 expr->left = malloc(sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1065 memcpy(expr->left, &bexpr, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1066 expr->right = calloc(1, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1067 expr->right->type = DAVQL_STRING;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1068 expr->right->srctext = token_sstr(token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1069
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1070 return total_consumed + 1;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1071 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1072 dav_error_in_context(DAVQL_ERROR_INVALID_STRING,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1073 _error_invalid_string, stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1074 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1075 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1076 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1077 // RULE: Expression, Comparison, Expression
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1078 else if (token_is(optok, DAVQL_TOKEN_OPERATOR) && (
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1079 tokenvalue_is(optok, "=") || tokenvalue_is(optok, "!") ||
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1080 tokenvalue_is(optok, "<") || tokenvalue_is(optok, ">"))) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1081
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1082 total_consumed++;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1083 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1084
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1085 if (tokenvalue_is(optok, "=")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1086 expr->op = DAVQL_EQ;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1087 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1088 if (tokenvalue_is(token, "=")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1089 if (tokenvalue_is(optok, "!")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1090 expr->type = DAVQL_NEQ;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1091 } else if (tokenvalue_is(optok, "<")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1092 expr->type = DAVQL_LE;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1093 } else if (tokenvalue_is(optok, ">")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1094 expr->type = DAVQL_GE;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1095 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1096 total_consumed++;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1097 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1098 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1099 if (tokenvalue_is(optok, "<")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1100 expr->type = DAVQL_LT;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1101 } else if (tokenvalue_is(optok, ">")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1102 expr->type = DAVQL_GT;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1103 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1104 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1105 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1106
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1107 int consumed = dav_parse_expression(stmt, token, expr->right);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1108 if (stmt->errorcode) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1109 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1110 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1111 if (!consumed) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1112 dav_error_in_context(
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1113 DAVQL_ERROR_MISSING_EXPR, _error_missing_expr,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1114 stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1115 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1116 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1117
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1118 total_consumed += consumed;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1119 expr->left = malloc(sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1120 memcpy(expr->left, &bexpr, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1121
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1122 return total_consumed;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1123 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1124 // RULE: FunctionCall | Identifier;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1125 else if (bexpr.type == DAVQL_FUNCCALL || bexpr.type == DAVQL_IDENTIFIER) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1126 memcpy(expr, &bexpr, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1127
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1128 return total_consumed;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1129 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1130 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1131 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1132 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1133
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1134 static int dav_parse_bool_expr(DavQLStatement *stmt, UcxList *token,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1135 DavQLExpression *expr) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1136
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1137 // RULE: "not ", LogicalExpression
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1138 if (token_is(token, DAVQL_TOKEN_OPERATOR) && tokenvalue_is(token, "not")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1139 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1140 expr->type = DAVQL_LOGICAL;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1141 expr->op = DAVQL_NOT;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1142 expr->left = calloc(1, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1143 expr->srctext = token_sstr(token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1144
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1145 int consumed = dav_parse_logical_expr(stmt, token, expr->left);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1146 if (stmt->errorcode) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1147 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1148 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1149 if (consumed) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1150 sstr_t lasttok = token_sstr(ucx_list_get(token, consumed-1));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1151 expr->srctext.length =
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1152 lasttok.ptr - expr->srctext.ptr + lasttok.length;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1153 return consumed + 1;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1154 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1155 dav_error_in_context(DAVQL_ERROR_MISSING_EXPR,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1156 _error_missing_expr, stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1157 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1158 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1159 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1160 // RULE: "(", LogicalExpression, ")"
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1161 else if (token_is(token, DAVQL_TOKEN_OPENP)) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1162 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1163
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1164 int consumed = dav_parse_logical_expr(stmt, token, expr);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1165 if (stmt->errorcode) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1166 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1167 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1168 if (!consumed) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1169 dav_error_in_context(DAVQL_ERROR_MISSING_EXPR,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1170 _error_missing_expr, stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1171 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1172 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1173
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1174 token = ucx_list_get(token, consumed);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1175
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1176 if (token_is(token, DAVQL_TOKEN_CLOSEP)) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1177 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1178 return consumed + 2;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1179 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1180 dav_error_in_context(DAVQL_ERROR_MISSING_PAR, _error_missing_par,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1181 stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1182 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1183 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1184 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1185 // RULE: BooleanExpression
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1186 else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1187 return dav_parse_bool_prim(stmt, token, expr);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1188 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1189 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1190
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1191 static int dav_parse_logical_expr(DavQLStatement *stmt, UcxList *token,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1192 DavQLExpression *expr) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1193
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1194 UcxList *firsttoken = token;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1195 int total_consumed = 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1196
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1197 // RULE: BooleanLiteral, [LogicalOperator, LogicalExpression];
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1198 DavQLExpression left, right;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1199 memset(&left, 0, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1200 int consumed = dav_parse_bool_expr(stmt, token, &left);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1201 if (stmt->errorcode) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1202 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1203 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1204 if (!consumed) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1205 dav_error_in_context(DAVQL_ERROR_MISSING_EXPR,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1206 _error_missing_expr, stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1207 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1208 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1209 total_consumed += consumed;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1210 token = ucx_list_get(token, consumed);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1211
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1212 if (token_is(token, DAVQL_TOKEN_OPERATOR)) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1213
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1214 davqloperator_t op = DAVQL_NOOP;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1215 if (tokenvalue_is(token, "and")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1216 op = DAVQL_LAND;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1217 } else if (tokenvalue_is(token, "or")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1218 op = DAVQL_LOR;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1219 } else if (tokenvalue_is(token, "xor")) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1220 op = DAVQL_LXOR;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1221 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1222
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1223 if (op == DAVQL_NOOP) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1224 dav_error_in_context(DAVQL_ERROR_INVALID_LOGICAL_OP,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1225 _error_invalid_logical_op, stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1226 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1227 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1228 expr->op = op;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1229 total_consumed++;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1230 token = token->next;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1231
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1232 memset(&right, 0, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1233 consumed = dav_parse_logical_expr(stmt, token, &right);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1234 if (stmt->errorcode) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1235 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1236 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1237 if (!consumed) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1238 dav_error_in_context(DAVQL_ERROR_MISSING_EXPR,
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1239 _error_missing_expr, stmt, token);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1240 return 0;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1241 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1242 total_consumed += consumed;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1243 token = ucx_list_get(token, consumed);
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1244
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1245 expr->left = malloc(sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1246 memcpy(expr->left, &left, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1247 expr->right = malloc(sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1248 memcpy(expr->right, &right, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1249 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1250 } else {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1251 memcpy(expr, &left, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1252 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1253
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1254 // set type and recover source text
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1255 if (total_consumed > 0) {
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1256 expr->type = DAVQL_LOGICAL;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1257
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1258 expr->srctext.ptr = token_sstr(firsttoken).ptr;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1259 sstr_t lasttok = token_sstr(ucx_list_get(firsttoken, total_consumed-1));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1260 expr->srctext.length = lasttok.ptr-expr->srctext.ptr+lasttok.length;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1261 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1262
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1263 return total_consumed;
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1264 }
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1265
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1266 static int dav_parse_where_clause(DavQLStatement *stmt, UcxList *token) {
115
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1267 stmt->where = calloc(1, sizeof(DavQLExpression));
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1268
5744a3dee766 completed logical expression parser - NEED TO TEST A LOT!
Mike Becker <universe@uap-core.de>
parents: 114
diff changeset
1269 return dav_parse_logical_expr(stmt, token, stmt->where);
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1270 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1271
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1272 static int dav_parse_with_clause(DavQLStatement *stmt, UcxList *token) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1273
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1274 int total_consumed = 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1275
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1276 // RULE: "depth", "=", (Number | "infinity")
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1277 if (tokenvalue_is(token, "depth")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1278 token = token->next; total_consumed++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1279 if (token_is(token, DAVQL_TOKEN_EQ)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1280 token = token->next; total_consumed++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1281 if (tokenvalue_is(token, "infinity")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1282 stmt->depth = DAV_DEPTH_INFINITY;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1283 token = token->next; total_consumed++;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1284 } else {
114
943548492a47 added function call parser + fixed some memory management mistakes
Mike Becker <universe@uap-core.de>
parents: 113
diff changeset
1285 DavQLExpression *depthexpr = calloc(1, sizeof(DavQLExpression));
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1286
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1287 int consumed = dav_parse_expression(stmt, token, depthexpr);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1288
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1289 if (consumed) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1290 if (depthexpr->type == DAVQL_NUMBER) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1291 if (depthexpr->srctext.ptr[0] == '%') {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1292 stmt->depth = DAV_DEPTH_PLACEHOLDER;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1293 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1294 sstr_t depthstr = depthexpr->srctext;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1295 char *conv = malloc(depthstr.length+1);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1296 char *chk;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1297 memcpy(conv, depthstr.ptr, depthstr.length);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1298 conv[depthstr.length] = '\0';
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1299 stmt->depth = strtol(conv, &chk, 10);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1300 if (*chk || stmt->depth < -1) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1301 dav_error_in_context(DAVQL_ERROR_INVALID_DEPTH,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1302 _error_invalid_depth, stmt, token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1303 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1304 free(conv);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1305 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1306 total_consumed += consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1307 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1308 dav_error_in_context(DAVQL_ERROR_INVALID_DEPTH,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1309 _error_invalid_depth, stmt, token);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1310 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1311 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1312
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1313 dav_free_expression(depthexpr);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1314 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1315 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1316 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1317
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1318 return total_consumed;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1319 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1320
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1321 static int dav_parse_orderby_clause(DavQLStatement *stmt, UcxList *token) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1322 return 0;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1323 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1324
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1325 /**
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1326 * Semantic analysis of a get statement.
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1327 * @param stmt the statement to analyze.
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1328 */
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1329 static void dav_analyze_get_statement(DavQLStatement *stmt) {
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1330 // TODO: make it so
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1331 }
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1332
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1333
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1334 /**
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1335 * Parser of a get statement.
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1336 * @param stmt the statement object that shall contain the syntax tree
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1337 * @param tokens the token list
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1338 */
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1339 static void dav_parse_get_statement(DavQLStatement *stmt, UcxList *tokens) {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1340 stmt->type = DAVQL_GET;
92
e073cf4afc6a added order by clause to grammar + moved with clause right after the from clause
Mike Becker <universe@uap-core.de>
parents: 91
diff changeset
1341
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1342 // Consume field list
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1343 tokens = ucx_list_get(tokens, dav_parse_fieldlist(stmt, tokens));
108
0199f13c7fe2 fixed parsing of binary expressions did not yield the correct type
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
1344 if (stmt->errorcode) {
0199f13c7fe2 fixed parsing of binary expressions did not yield the correct type
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
1345 return;
0199f13c7fe2 fixed parsing of binary expressions did not yield the correct type
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
1346 }
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1347
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1348 // Consume from keyword
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1349 if (token_is(tokens, DAVQL_TOKEN_KEYWORD)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1350 && tokenvalue_is(tokens, "from")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1351 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1352 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1353 dav_error_in_context(DAVQL_ERROR_MISSING_TOKEN,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1354 _error_missing_from, stmt, tokens);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1355 return;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1356 }
83
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1357
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1358 // Consume path
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1359 if (token_is(tokens, DAVQL_TOKEN_STRING)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1360 stmt->path = token_sstr(tokens);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1361 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1362 } else if (token_is(tokens, DAVQL_TOKEN_OPERATOR)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1363 && tokenvalue_is(tokens, "/")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1364 stmt->path.ptr = token_sstr(tokens).ptr;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1365 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1366 while (!token_is(tokens, DAVQL_TOKEN_KEYWORD)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1367 sstr_t toksstr = token_sstr(tokens);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1368 stmt->path.length = toksstr.ptr-stmt->path.ptr+toksstr.length;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1369 tokens = tokens->next;
83
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1370 }
107
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1371 } else if (token_is(tokens, DAVQL_TOKEN_FMTSPEC) &&
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1372 tokenvalue_is(tokens, "%s")) {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1373 stmt->path = token_sstr(tokens);
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1374 tokens = tokens->next;
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1375 } else {
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1376 dav_error_in_context(DAVQL_ERROR_MISSING_TOKEN,
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1377 _error_missing_path, stmt, tokens);
a0903d2d8e3e added format specifier parser
Mike Becker <universe@uap-core.de>
parents: 106
diff changeset
1378 return;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1379 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1380
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1381 // Consume with clause (if any)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1382 if (token_is(tokens, DAVQL_TOKEN_KEYWORD)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1383 && tokenvalue_is(tokens, "with")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1384 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1385 tokens = ucx_list_get(tokens,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1386 dav_parse_with_clause(stmt, tokens));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1387 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1388 if (stmt->errorcode) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1389 return;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1390 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1391
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1392 // Consume where clause (if any)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1393 if (token_is(tokens, DAVQL_TOKEN_KEYWORD)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1394 && tokenvalue_is(tokens, "where")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1395 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1396 tokens = ucx_list_get(tokens,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1397 dav_parse_where_clause(stmt, tokens));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1398 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1399 if (stmt->errorcode) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1400 return;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1401 }
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1402
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1403 // Consume order by clause (if any)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1404 if (token_is(tokens, DAVQL_TOKEN_KEYWORD)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1405 && tokenvalue_is(tokens, "order")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1406 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1407 if (token_is(tokens, DAVQL_TOKEN_KEYWORD)
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1408 && tokenvalue_is(tokens, "by")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1409 tokens = tokens->next;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1410 tokens = ucx_list_get(tokens,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1411 dav_parse_orderby_clause(stmt, tokens));
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1412 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1413 dav_error_in_context(DAVQL_ERROR_MISSING_TOKEN,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1414 _error_missing_by, stmt, tokens);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1415 return;
94
8822f7c08843 removed ultrabreak gotos
Mike Becker <universe@uap-core.de>
parents: 93
diff changeset
1416 }
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1417 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1418 if (stmt->errorcode) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1419 return;
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1420 }
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1421
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1422
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1423 if (tokens) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1424 if (token_is(tokens, DAVQL_TOKEN_INVALID)) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1425 dav_error_in_context(DAVQL_ERROR_INVALID_TOKEN,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1426 _error_invalid_token, stmt, tokens);
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1427 } else {
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1428 dav_error_in_context(DAVQL_ERROR_UNEXPECTED_TOKEN,
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1429 _error_unexpected_token, stmt, tokens);
102
e9ae1318a559 reworked expression grammar (removed left recursion) + added field names to debugger + fixed bug when WITH-clause was the last clause in a statement
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
1430 }
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1431 } else {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1432 dav_analyze_get_statement(stmt);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1433 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1434 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1435
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1436 static void dav_parse_set_statement(DavQLStatement *stmt, UcxList *tokens) {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1437 stmt->type = DAVQL_SET;
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1438
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1439 // TODO: make it so
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1440 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1441
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1442 DavQLStatement* dav_parse_statement(sstr_t srctext) {
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1443 DavQLStatement *stmt = calloc(1, sizeof(DavQLStatement));
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1444
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1445 // default values
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1446 stmt->type = -1;
85
0ab1cf261a44 improved grammar + changed depth default, type and added infinity
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
1447 stmt->depth = 1;
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1448
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1449 // save trimmed source text
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1450 stmt->srctext = sstrtrim(srctext);
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1451
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1452 // tokenization
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1453 UcxList* tokens = dav_parse_tokenize(stmt->srctext);
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1454
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1455 if (tokens) {
83
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1456 // use first token to determine query type
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1457
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1458 if (tokenvalue_is(tokens, "get")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1459 dav_parse_get_statement(stmt, tokens->next);
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1460 } else if (tokenvalue_is(tokens, "set")) {
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1461 dav_parse_set_statement(stmt, tokens->next);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1462 } else {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1463 stmt->type = DAVQL_ERROR;
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
1464 stmt->errorcode = DAVQL_ERROR_INVALID;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1465 stmt->errormessage = strdup(_error_invalid);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1466 }
83
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1467
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1468 // free token data
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1469 UCX_FOREACH(token, tokens) {
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1470 free(token->data);
7d20ce5d235b improved expression parser (can now detect literals and identifiers) - TODO: tokenizer must not split strings and "backstick-identifiers"
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
1471 }
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1472 ucx_list_free(tokens);
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1473 } else {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1474 stmt->type = DAVQL_ERROR;
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
1475 stmt->errorcode = DAVQL_ERROR_INVALID;
106
9cec78f23cbf started refactoring davqlparser
Mike Becker <universe@uap-core.de>
parents: 103
diff changeset
1476 stmt->errormessage = strdup(_error_invalid);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1477 }
79
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1478
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1479 return stmt;
59c518ae0641 added parse function prototype + started writing a debugger
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
1480 }
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1481
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1482 void dav_free_statement(DavQLStatement *stmt) {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1483 UCX_FOREACH(expr, stmt->fields) {
98
237844f263b4 minor grammar fix (alias name is now identifier and not string) + completed debugger (so far) + separated field list parser (currently unable to parse alias names) + new structure for fields
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
1484 dav_free_field(expr->data);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1485 }
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1486 ucx_list_free(stmt->fields);
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1487
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1488 if (stmt->where) {
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1489 dav_free_expression(stmt->where);
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1490 }
86
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
1491 if (stmt->errormessage) {
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
1492 free(stmt->errormessage);
ecba8bdf9741 davql: error handling + minor grammar changes
Mike Becker <universe@uap-core.de>
parents: 85
diff changeset
1493 }
95
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
1494 UCX_FOREACH(crit, stmt->orderby) {
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
1495 dav_free_order_criterion(crit->data);
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
1496 }
8ed7d8df6427 simplified with clause parsing + added order by to data structure and debugger (TODO: implement)
Mike Becker <universe@uap-core.de>
parents: 94
diff changeset
1497 ucx_list_free(stmt->orderby);
82
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1498 free(stmt);
0567444f2d76 renamed some enums to avoid collisions with macros + minor grammar change (backsticks for identifiers) + tokenizer + parser skeleton
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
1499 }

mercurial