From: <ibr...@us...> - 2011-06-20 19:35:50
|
Revision: 3979 http://tora.svn.sourceforge.net/tora/?rev=3979&view=rev Author: ibre5041 Date: 2011-06-20 19:35:44 +0000 (Mon, 20 Jun 2011) Log Message: ----------- boost compile fix - do not use #define N <whatever> Modified Paths: -------------- branches/tora-trotl/sandbox/OraclePLSQL.g Modified: branches/tora-trotl/sandbox/OraclePLSQL.g =================================================================== --- branches/tora-trotl/sandbox/OraclePLSQL.g 2011-06-20 19:34:39 UTC (rev 3978) +++ branches/tora-trotl/sandbox/OraclePLSQL.g 2011-06-20 19:35:44 UTC (rev 3979) @@ -50,6 +50,7 @@ //Alias type(declaration, usage) T_DECL = 't_decl'; T_USE = 't_use'; + T_USE_L = 't_use_l'; // 'L' for lvalue, the variable is beeing assigned/modified here //block types T_BLOCK_BLOCK='t_block_block'; @@ -1099,7 +1100,7 @@ BINDVAR /*options { testLiterals=true; }*/ : COLON 'A' .. 'Z' ( 'A' .. 'Z' | '0' .. '9' | '_' | '$' | '#' | COLON )* | COLON DOUBLEQUOTED_STRING - | COLON N // NOTE: N was NUM + | COLON NUM ; ID /*options { testLiterals=true; }*/ @@ -1212,21 +1213,17 @@ ; INTEGER - : N + : NUM ; REAL_NUMBER - : NUMBER_VALUE ( 'e' ( PLUS | MINUS )? N )? + : NUMBER_VALUE ( 'e' ( PLUS | MINUS )? NUM )? ; fragment NUMBER_VALUE - : {numberDotValid(CTX)}? => N POINT N? - | POINT N - | N + : {numberDotValid(CTX)}? => NUM POINT NUM? + | POINT NUM + | NUM ; -fragment -N - : '0' .. '9' ( '0' .. '9' )* - ; // TODO: support numbers line 1d (1 decimal) // NUMBER // : //( PLUS | MINUS )? @@ -1237,10 +1234,10 @@ // ( 'E' ( PLUS | MINUS )? NUM )? // ( 'D' | 'F')? // ; -// fragment -// NUM -// : '0' .. '9' ( '0' .. '9' )* -// ; +fragment +NUM + : '0' .. '9' ( '0' .. '9' )* + ; QUOTE : '\'' ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |