[Monetdb-developers] [Monetdb-pf-checkins] pathfinder/compiler/parser scanner.l, 1.40, 1.41 parser.y, 1.49, 1.50

Torsten Grust torsten.grust at gmail.com
Tue Nov 7 23:23:03 CET 2006


Argh, sorry, Stefan... :-/  Let me know how I can help to fix this  
(can I?).

    --Teggy

On Nov 7, 2006, 11:19 PM, Stefan Manegold wrote with possible deletions:
> Teggy,
>
> I wasn't done with the branches, yet, hence your checkins are  
> somewhere in
> "no man's land" and in particular mess-up my tagging schemes ... |-(
>
> As said, I'll let you know once I'm done with the branches --- and  
> whether I
> manages to fix my tagging schemes which are (a.o.) crucial for  
> allowing convenient
> propagation of bug fixes from the release branches to the development
> trunks...
>
> Stefan
>
> On Tue, Nov 07, 2006 at 10:10:30PM +0000, Torsten Grust wrote:
>> Update of /cvsroot/monetdb/pathfinder/compiler/parser
>> In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15478/ 
>> compiler/parser
>>
>> Modified Files:
>> 	scanner.l parser.y
>> Log Message:
>> Added support for the syntactically ''lighter'' variant of XRPC
>> invocation.  May only used if a literal URI is given:
>>
>> 	execute at URILiteral { FunctionCall }
>>
>>
>>
>> Index: parser.y
>> ===================================================================
>> RCS file: /cvsroot/monetdb/pathfinder/compiler/parser/parser.y,v
>> retrieving revision 1.49
>> retrieving revision 1.50
>> diff -u -d -r1.49 -r1.50
>> --- parser.y	7 Nov 2006 07:53:59 -0000	1.49
>> +++ parser.y	7 Nov 2006 22:10:28 -0000	1.50
>> @@ -357,7 +357,7 @@
>>  %token every_dollar                    "every $"
>>  %token except                          "except"
>>  %token excl_equals                     "!="
>> -%token execute_at_lbrace               "execute at {"
>> +%token execute_at                      "execute at"
>>  %token external_                       "external"
>>  %token following_colon_colon           "following::"
>>  %token following_sibling_colon_colon   "following-sibling::"
>> @@ -2779,8 +2779,16 @@
>>  /* end of the Pathfinder recursion extension */
>>
>>  /* Pathfinder extension: XRPC */
>> -XRPCCall                  : "execute at {" Expr "}" "{"  
>> FunctionCall "}"
>> -                            { $$ = wire2 (p_xrpc, @$, $2, $5); }
>> +XRPCCall                  : "execute at" "{" ExprSingle "}" "{"  
>> FunctionCall "}"
>> +                            { $$ = wire2 (p_xrpc, @$, $3, $6); }
>> +                          | "execute at" URILiteral "{"  
>> FunctionCall "}"
>> +                            { $$ = wire2 (p_xrpc,
>> +                                          @$,
>> +                                          (c = leaf (p_lit_str, @2),
>> +                                           c->sem.str = $2,
>> +                                           c),
>> +                                          $4);
>> +                            }
>>                            ;
>>  /* End Pathfinder extension */
>>
>>
>> Index: scanner.l
>> ===================================================================
>> RCS file: /cvsroot/monetdb/pathfinder/compiler/parser/scanner.l,v
>> retrieving revision 1.40
>> retrieving revision 1.41
>> diff -u -d -r1.40 -r1.41
>> --- scanner.l	24 Oct 2006 15:20:02 -0000	1.40
>> +++ scanner.l	7 Nov 2006 22:10:28 -0000	1.41
>> @@ -604,8 +604,8 @@
>>                                       yield (document_lbrace); }
>>  "element"{_}?"{"                   { pushState (OPERATOR);  
>> pushState (DEFAULT);
>>                                       yield (element_lbrace); }
>> -"execute"{_}"at"{_}?"{"            { pushState (OPERATOR);  
>> pushState (DEFAULT);
>> -                                     yield (execute_at_lbrace); }
>> +"execute"{_}"at"                   { pushState (OPERATOR);  
>> pushState (DEFAULT);
>> +                                     yield (execute_at); }
>>  "attribute"{_}?"{"                 { pushState (OPERATOR);  
>> pushState (DEFAULT);
>>                                       yield (attribute_lbrace); }
>>  "text"{_}?"{"                      { pushState (OPERATOR);
>>
>>
>> --------------------------------------------------------------------- 
>> ----
>> Using Tomcat but need to do more? Need to support web services,  
>> security?
>> Get stuff done quickly with pre-integrated technology to make your  
>> job easier
>> Download IBM WebSphere Application Server v.1.0.1 based on Apache  
>> Geronimo
>> http://sel.as-us.falkag.net/sel? 
>> cmd=lnk&kid=120709&bid=263057&dat=121642
>> _______________________________________________
>> Monetdb-pf-checkins mailing list
>> Monetdb-pf-checkins at lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
>>
>>
>
> -- 
> | Dr. Stefan Manegold | mailto:Stefan.Manegold at cwi.nl |
> | CWI,  P.O.Box 94079 | http://www.cwi.nl/~manegold/  |
> | 1090 GB Amsterdam   | Tel.: +31 (20) 592-4212       |
> | The Netherlands     | Fax : +31 (20) 592-4312       |
>
> ---------------------------------------------------------------------- 
> ---
> Using Tomcat but need to do more? Need to support web services,  
> security?
> Get stuff done quickly with pre-integrated technology to make your  
> job easier
> Download IBM WebSphere Application Server v.1.0.1 based on Apache  
> Geronimo
> http://sel.as-us.falkag.net/sel? 
> cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> Monetdb-pf-checkins mailing list
> Monetdb-pf-checkins at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

-- 
| Torsten Grust
| torsten.grust at gmail.com







More information about the developers-list mailing list