Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21352/modules/pftijah/tjc
Modified Files:
Tag: M5XQ
tjc_parse.y
Log Message:
propagated changes of Thursday Jan 28 2010
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/28 - sjoerd: modules/pftijah/tjc/tjc_parse.y,1.13.4.2
propagated changes of Thursday Jan 28 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/28 - sjoerd: modules/pftijah/tjc/tjc_parse.y,1.15
propagated changes of Wednesday Jan 27 2010 - Thursday Jan 28 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/27 - hrode: modules/pftijah/tjc/tjc_parse.y,1.13.6.2
recovery after syntactically wrong NEXI query
(consecutive queries used to fail as well, since the flex buffer was not
cleaned)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: tjc_parse.y
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_parse.y,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -d -r1.9.2.5 -r1.9.2.6
--- tjc_parse.y 18 Jan 2010 14:49:41 -0000 1.9.2.5
+++ tjc_parse.y 28 Jan 2010 13:01:50 -0000 1.9.2.6
@@ -144,7 +144,7 @@
if ($3) { *($3->fixme) = $2->root; $$ = tjcp_wire1
(tjc_tree, p_nexi, $3->root);
TJCfree($2); TJCfree($3); }
else { $$ = tjcp_wire1 (tjc_tree, p_nexi,
$2->root); TJCfree($2); }
- }
+ }
;
RelativePath_ : "."
{ $$ = tjcp_leaf (tjc_tree, p_ctx); }
@@ -294,10 +294,15 @@
int tjc_parser (char* input, TJptree_t **res)
{
+ int result = 0;
setTJCscanstring(input);
tjc_tree = tjcp_inittree();
- int result = tjcparse();
+ if (tjcparse()) {
+ result = 1; // parsing failed
+ }
+ destroyTJCscanBuffer();
+
*res = tjc_tree;
tjc_tree = NULL;
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
