Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/raptor/patches/raptor-2.0.3-allow-instead-of-in-trig.patch

    Contents of /trunk/raptor/patches/raptor-2.0.3-allow-instead-of-in-trig.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1430 - (show annotations) (download)
    Thu Jul 21 14:16:36 2011 UTC (12 years, 9 months ago) by niro
    File size: 23777 byte(s) 
    upstream fixes
    1 diff -ur ../../raptor2-2.0.3/src/turtle_lexer.c ./src/turtle_lexer.c
    2 --- ../../raptor2-2.0.3/src/turtle_lexer.c 2011-05-31 21:14:41.000000000 +0200
    3 +++ ./src/turtle_lexer.c 2011-07-12 15:31:39.620638699 +0200
    4 @@ -62,6 +62,7 @@
    5 typedef unsigned char flex_uint8_t;
    6 typedef unsigned short int flex_uint16_t;
    7 typedef unsigned int flex_uint32_t;
    8 +#endif /* ! C99 */
    9
    10 /* Limits of integral types. */
    11 #ifndef INT8_MIN
    12 @@ -92,8 +93,6 @@
    13 #define UINT32_MAX (4294967295U)
    14 #endif
    15
    16 -#endif /* ! C99 */
    17 -
    18 #endif /* ! FLEXINT_H */
    19
    20 #ifdef __cplusplus
    21 @@ -167,15 +166,7 @@
    22
    23 /* Size of default input buffer. */
    24 #ifndef YY_BUF_SIZE
    25 -#ifdef __ia64__
    26 -/* On IA-64, the buffer size is 16k, not 8k.
    27 - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
    28 - * Ditto for the __ia64__ case accordingly.
    29 - */
    30 -#define YY_BUF_SIZE 32768
    31 -#else
    32 #define YY_BUF_SIZE 16384
    33 -#endif /* __ia64__ */
    34 #endif
    35
    36 /* The state buf must be large enough to hold one state per character in the main buffer.
    37 @@ -371,7 +362,7 @@
    38 flex_int32_t yy_verify;
    39 flex_int32_t yy_nxt;
    40 };
    41 -static yyconst flex_int16_t yy_accept[114] =
    42 +static yyconst flex_int16_t yy_accept[112] =
    43 { 0,
    44 0, 0, 0, 0, 22, 22, 41, 39, 2, 1,
    45 1, 39, 38, 13, 14, 39, 5, 4, 28, 25,
    46 @@ -384,8 +375,8 @@
    47 26, 0, 0, 27, 0, 25, 0, 0, 33, 0,
    48 0, 24, 36, 36, 21, 0, 27, 0, 27, 0,
    49
    50 - 0, 0, 0, 24, 36, 17, 0, 10, 0, 18,
    51 - 0, 9, 0
    52 + 0, 0, 24, 36, 17, 10, 0, 18, 0, 9,
    53 + 0
    54 } ;
    55
    56 static yyconst flex_int32_t yy_ec[256] =
    57 @@ -396,154 +387,157 @@
    58 1, 2, 1, 5, 6, 1, 1, 1, 1, 7,
    59 8, 1, 9, 10, 11, 12, 1, 13, 13, 13,
    60 13, 13, 13, 13, 13, 13, 13, 14, 15, 16,
    61 - 1, 17, 1, 18, 19, 19, 19, 19, 20, 19,
    62 - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
    63 - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
    64 - 21, 22, 23, 24, 25, 1, 26, 27, 19, 19,
    65 -
    66 - 28, 29, 19, 19, 30, 19, 19, 31, 19, 19,
    67 - 19, 32, 19, 33, 34, 35, 36, 19, 19, 37,
    68 - 19, 19, 38, 1, 39, 1, 1, 40, 40, 40,
    69 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    70 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    71 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    72 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    73 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    74 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    75 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    76 -
    77 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    78 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    79 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    80 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    81 - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
    82 - 40, 40, 40, 40, 40
    83 + 17, 18, 1, 19, 20, 20, 20, 20, 21, 20,
    84 + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
    85 + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
    86 + 22, 23, 24, 25, 26, 1, 27, 28, 20, 20,
    87 +
    88 + 29, 30, 20, 20, 31, 20, 20, 32, 20, 20,
    89 + 20, 33, 20, 34, 35, 36, 37, 20, 20, 38,
    90 + 20, 20, 39, 1, 40, 1, 1, 41, 41, 41,
    91 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    92 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    93 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    94 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    95 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    96 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    97 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    98 +
    99 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    100 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    101 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    102 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    103 + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
    104 + 41, 41, 41, 41, 41
    105 } ;
    106
    107 -static yyconst flex_int32_t yy_meta[41] =
    108 +static yyconst flex_int32_t yy_meta[42] =
    109 { 0,
    110 1, 2, 3, 4, 5, 1, 1, 1, 1, 1,
    111 - 6, 1, 6, 7, 1, 1, 1, 1, 8, 8,
    112 - 1, 8, 1, 1, 8, 8, 8, 8, 8, 8,
    113 - 8, 8, 8, 8, 8, 8, 8, 2, 1, 8
    114 + 6, 1, 6, 7, 1, 1, 2, 1, 1, 8,
    115 + 8, 1, 8, 1, 1, 8, 8, 8, 8, 8,
    116 + 8, 8, 8, 8, 8, 8, 8, 8, 2, 1,
    117 + 8
    118 } ;
    119
    120 -static yyconst flex_int16_t yy_base[126] =
    121 +static yyconst flex_int16_t yy_base[124] =
    122 { 0,
    123 - 0, 0, 40, 0, 78, 79, 285, 299, 259, 299,
    124 - 257, 80, 83, 299, 299, 76, 299, 246, 78, 90,
    125 - 299, 227, 67, 81, 299, 229, 299, 207, 215, 83,
    126 - 93, 83, 299, 299, 299, 225, 299, 211, 105, 107,
    127 - 219, 108, 221, 299, 109, 217, 0, 114, 299, 218,
    128 - 207, 112, 117, 121, 133, 133, 208, 136, 299, 201,
    129 - 149, 191, 183, 189, 151, 200, 299, 0, 117, 86,
    130 - 211, 198, 299, 153, 154, 155, 206, 299, 299, 153,
    131 - 157, 169, 197, 196, 165, 170, 188, 196, 299, 172,
    132 - 177, 0, 135, 153, 299, 191, 188, 187, 186, 190,
    133 -
    134 - 192, 170, 154, 0, 160, 133, 194, 299, 125, 100,
    135 - 83, 299, 299, 232, 240, 248, 255, 263, 266, 269,
    136 - 272, 280, 287, 88, 290
    137 + 0, 0, 41, 0, 80, 81, 262, 301, 259, 301,
    138 + 243, 82, 85, 301, 301, 78, 301, 232, 80, 93,
    139 + 301, 215, 66, 83, 301, 217, 301, 205, 215, 84,
    140 + 88, 85, 301, 301, 301, 226, 301, 212, 97, 105,
    141 + 220, 111, 222, 301, 108, 218, 0, 114, 301, 219,
    142 + 208, 109, 113, 114, 128, 142, 144, 146, 301, 202,
    143 + 148, 192, 184, 190, 150, 202, 301, 0, 128, 96,
    144 + 212, 199, 301, 133, 151, 159, 207, 301, 301, 157,
    145 + 148, 162, 198, 197, 155, 176, 188, 193, 301, 174,
    146 + 179, 0, 145, 155, 301, 194, 193, 191, 190, 195,
    147 +
    148 + 173, 171, 0, 159, 173, 301, 168, 165, 138, 301,
    149 + 301, 234, 242, 250, 257, 265, 268, 271, 274, 282,
    150 + 289, 132, 292
    151 } ;
    152
    153 -static yyconst flex_int16_t yy_def[126] =
    154 +static yyconst flex_int16_t yy_def[124] =
    155 { 0,
    156 - 113, 1, 113, 3, 114, 114, 113, 113, 113, 113,
    157 - 113, 115, 116, 113, 113, 113, 113, 113, 113, 117,
    158 - 113, 118, 113, 119, 113, 120, 113, 113, 113, 119,
    159 - 119, 31, 113, 113, 113, 113, 113, 121, 122, 122,
    160 - 113, 122, 113, 113, 115, 113, 115, 116, 113, 113,
    161 - 113, 113, 113, 113, 113, 113, 113, 123, 113, 118,
    162 - 113, 113, 113, 31, 117, 120, 113, 124, 31, 31,
    163 - 113, 121, 113, 122, 122, 122, 113, 113, 113, 113,
    164 - 113, 113, 113, 113, 113, 123, 113, 113, 113, 113,
    165 - 113, 125, 31, 31, 113, 113, 113, 113, 113, 113,
    166 -
    167 - 113, 113, 113, 125, 31, 31, 113, 113, 113, 31,
    168 - 113, 113, 0, 113, 113, 113, 113, 113, 113, 113,
    169 - 113, 113, 113, 113, 113
    170 + 111, 1, 111, 3, 112, 112, 111, 111, 111, 111,
    171 + 111, 113, 114, 111, 111, 111, 111, 111, 111, 115,
    172 + 111, 116, 111, 117, 111, 118, 111, 111, 111, 117,
    173 + 117, 31, 111, 111, 111, 111, 111, 119, 120, 120,
    174 + 111, 120, 111, 111, 113, 111, 113, 114, 111, 111,
    175 + 111, 111, 111, 111, 111, 111, 111, 121, 111, 116,
    176 + 111, 111, 111, 31, 115, 118, 111, 122, 31, 31,
    177 + 111, 119, 111, 120, 120, 120, 111, 111, 111, 111,
    178 + 111, 111, 111, 111, 111, 121, 111, 111, 111, 111,
    179 + 111, 123, 31, 31, 111, 111, 111, 111, 111, 111,
    180 +
    181 + 111, 111, 123, 31, 31, 111, 111, 31, 111, 111,
    182 + 0, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    183 + 111, 111, 111
    184 } ;
    185
    186 -static yyconst flex_int16_t yy_nxt[340] =
    187 +static yyconst flex_int16_t yy_nxt[343] =
    188 { 0,
    189 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
    190 - 16, 18, 19, 20, 21, 22, 8, 23, 24, 24,
    191 - 25, 26, 27, 28, 29, 30, 24, 24, 31, 24,
    192 - 24, 24, 24, 24, 32, 24, 24, 33, 34, 26,
    193 - 35, 36, 35, 35, 35, 35, 35, 35, 35, 35,
    194 - 35, 35, 35, 37, 35, 35, 35, 35, 38, 38,
    195 - 35, 38, 35, 35, 35, 38, 38, 38, 38, 38,
    196 - 38, 38, 38, 38, 38, 38, 38, 35, 35, 38,
    197 - 40, 40, 41, 41, 46, 49, 50, 51, 52, 54,
    198 - 52, 56, 56, 62, 65, 92, 65, 55, 63, 42,
    199 -
    200 - 42, 47, 66, 57, 66, 55, 65, 75, 64, 75,
    201 - 113, 64, 74, 78, 66, 70, 49, 50, 69, 112,
    202 - 66, 94, 66, 54, 52, 64, 76, 59, 76, 53,
    203 - 47, 55, 66, 81, 56, 56, 80, 56, 56, 55,
    204 - 82, 83, 64, 83, 80, 84, 57, 93, 82, 57,
    205 - 87, 87, 56, 56, 111, 75, 75, 113, 64, 74,
    206 - 64, 96, 88, 96, 57, 97, 100, 100, 105, 81,
    207 - 59, 56, 56, 59, 76, 76, 82, 98, 64, 98,
    208 - 106, 99, 109, 57, 82, 64, 89, 110, 59, 87,
    209 - 87, 100, 100, 107, 107, 107, 107, 108, 99, 99,
    210 -
    211 - 97, 88, 59, 97, 103, 102, 101, 59, 84, 84,
    212 - 95, 73, 71, 65, 64, 91, 90, 61, 85, 53,
    213 - 49, 79, 43, 77, 73, 89, 71, 59, 68, 89,
    214 - 67, 89, 39, 39, 39, 39, 39, 39, 39, 39,
    215 - 45, 45, 65, 61, 45, 45, 45, 45, 48, 48,
    216 - 48, 48, 48, 48, 48, 48, 58, 58, 53, 44,
    217 - 43, 58, 58, 60, 60, 60, 60, 60, 60, 60,
    218 - 60, 64, 64, 64, 66, 66, 66, 72, 72, 72,
    219 - 74, 74, 74, 74, 113, 74, 74, 74, 86, 86,
    220 - 113, 113, 86, 86, 86, 104, 113, 104, 7, 113,
    221 -
    222 - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
    223 - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
    224 - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
    225 - 113, 113, 113, 113, 113, 113, 113, 113, 113
    226 + 16, 18, 19, 20, 21, 22, 8, 8, 23, 24,
    227 + 24, 25, 26, 27, 28, 29, 30, 24, 24, 31,
    228 + 24, 24, 24, 24, 24, 32, 24, 24, 33, 34,
    229 + 26, 35, 36, 35, 35, 35, 35, 35, 35, 35,
    230 + 35, 35, 35, 35, 37, 35, 35, 35, 35, 35,
    231 + 38, 38, 35, 38, 35, 35, 35, 38, 38, 38,
    232 + 38, 38, 38, 38, 38, 38, 38, 38, 38, 35,
    233 + 35, 38, 40, 40, 41, 41, 46, 49, 50, 51,
    234 + 52, 54, 52, 62, 56, 56, 65, 65, 63, 75,
    235 +
    236 + 55, 65, 42, 42, 47, 66, 66, 75, 55, 57,
    237 + 66, 64, 78, 111, 69, 74, 49, 50, 70, 76,
    238 + 54, 52, 64, 66, 66, 53, 81, 76, 66, 55,
    239 + 47, 59, 94, 80, 82, 75, 83, 55, 83, 92,
    240 + 84, 80, 82, 56, 56, 85, 85, 56, 56, 87,
    241 + 87, 56, 56, 75, 64, 76, 85, 85, 57, 93,
    242 + 81, 111, 57, 74, 88, 96, 57, 96, 82, 97,
    243 + 98, 64, 98, 76, 99, 110, 82, 56, 56, 104,
    244 + 59, 64, 59, 105, 59, 64, 89, 108, 59, 87,
    245 + 87, 64, 57, 59, 100, 100, 100, 100, 109, 64,
    246 +
    247 + 107, 106, 99, 99, 88, 97, 97, 102, 101, 84,
    248 + 84, 95, 73, 71, 59, 65, 64, 91, 90, 61,
    249 + 53, 49, 79, 43, 77, 73, 89, 71, 68, 67,
    250 + 65, 89, 61, 89, 39, 39, 39, 39, 39, 39,
    251 + 39, 39, 45, 45, 53, 44, 45, 45, 45, 45,
    252 + 48, 48, 48, 48, 48, 48, 48, 48, 58, 58,
    253 + 43, 111, 111, 111, 58, 60, 60, 60, 60, 60,
    254 + 60, 60, 60, 64, 64, 64, 66, 66, 66, 72,
    255 + 72, 72, 74, 74, 74, 74, 111, 74, 74, 74,
    256 + 86, 86, 111, 111, 86, 111, 86, 103, 111, 103,
    257 +
    258 + 7, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    259 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    260 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    261 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    262 + 111, 111
    263 } ;
    264
    265 -static yyconst flex_int16_t yy_chk[340] =
    266 +static yyconst flex_int16_t yy_chk[343] =
    267 { 0,
    268 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
    269 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
    270 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
    271 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
    272 + 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    273 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    274 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    275 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    276 - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    277 - 5, 6, 5, 6, 12, 13, 13, 16, 16, 19,
    278 - 19, 20, 20, 23, 24, 124, 30, 19, 23, 5,
    279 + 3, 3, 5, 6, 5, 6, 12, 13, 13, 16,
    280 + 16, 19, 19, 23, 20, 20, 24, 30, 23, 39,
    281
    282 - 6, 12, 24, 20, 30, 19, 31, 39, 32, 40,
    283 - 42, 70, 42, 45, 31, 32, 48, 48, 31, 111,
    284 - 24, 70, 30, 52, 52, 110, 39, 20, 40, 53,
    285 - 45, 52, 31, 54, 56, 56, 53, 58, 58, 52,
    286 - 54, 55, 69, 55, 53, 55, 56, 69, 54, 58,
    287 - 61, 61, 65, 65, 109, 74, 75, 76, 106, 76,
    288 - 93, 80, 61, 80, 65, 80, 85, 85, 93, 81,
    289 - 56, 86, 86, 58, 74, 75, 81, 82, 94, 82,
    290 - 94, 82, 103, 86, 81, 105, 61, 105, 65, 87,
    291 - 87, 100, 100, 101, 101, 107, 107, 102, 99, 98,
    292 -
    293 - 97, 87, 85, 96, 91, 90, 88, 86, 84, 83,
    294 - 77, 72, 71, 66, 64, 63, 62, 60, 57, 51,
    295 - 50, 46, 43, 41, 38, 87, 36, 100, 29, 101,
    296 - 28, 107, 114, 114, 114, 114, 114, 114, 114, 114,
    297 - 115, 115, 26, 22, 115, 115, 115, 115, 116, 116,
    298 - 116, 116, 116, 116, 116, 116, 117, 117, 18, 11,
    299 - 9, 117, 117, 118, 118, 118, 118, 118, 118, 118,
    300 - 118, 119, 119, 119, 120, 120, 120, 121, 121, 121,
    301 - 122, 122, 122, 122, 7, 122, 122, 122, 123, 123,
    302 - 0, 0, 123, 123, 123, 125, 0, 125, 113, 113,
    303 -
    304 - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
    305 - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
    306 - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
    307 - 113, 113, 113, 113, 113, 113, 113, 113, 113
    308 + 19, 31, 5, 6, 12, 24, 30, 40, 19, 20,
    309 + 31, 32, 45, 42, 31, 42, 48, 48, 32, 39,
    310 + 52, 52, 70, 24, 30, 53, 54, 40, 31, 52,
    311 + 45, 20, 70, 53, 54, 74, 55, 52, 55, 122,
    312 + 55, 53, 54, 56, 56, 57, 57, 58, 58, 61,
    313 + 61, 65, 65, 75, 69, 74, 85, 85, 56, 69,
    314 + 81, 76, 58, 76, 61, 80, 65, 80, 81, 80,
    315 + 82, 93, 82, 75, 82, 109, 81, 86, 86, 93,
    316 + 56, 94, 57, 94, 58, 104, 61, 104, 65, 87,
    317 + 87, 108, 86, 85, 88, 88, 100, 100, 107, 105,
    318 +
    319 + 102, 101, 99, 98, 87, 97, 96, 91, 90, 84,
    320 + 83, 77, 72, 71, 86, 66, 64, 63, 62, 60,
    321 + 51, 50, 46, 43, 41, 38, 87, 36, 29, 28,
    322 + 26, 88, 22, 100, 112, 112, 112, 112, 112, 112,
    323 + 112, 112, 113, 113, 18, 11, 113, 113, 113, 113,
    324 + 114, 114, 114, 114, 114, 114, 114, 114, 115, 115,
    325 + 9, 7, 0, 0, 115, 116, 116, 116, 116, 116,
    326 + 116, 116, 116, 117, 117, 117, 118, 118, 118, 119,
    327 + 119, 119, 120, 120, 120, 120, 0, 120, 120, 120,
    328 + 121, 121, 0, 0, 121, 0, 121, 123, 0, 123,
    329 +
    330 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    331 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    332 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    333 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
    334 + 111, 111
    335 } ;
    336
    337 /* The intent behind this definition is that it'll catch
    338 @@ -704,7 +698,7 @@
    339 */
    340 /* similar to SPARQL but no need for <= check here */
    341
    342 -#line 708 "turtle_lexer.c"
    343 +#line 702 "turtle_lexer.c"
    344
    345 #define INITIAL 0
    346 #define PREF 1
    347 @@ -791,6 +785,10 @@
    348
    349 void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner );
    350
    351 +int turtle_lexer_get_column (yyscan_t yyscanner );
    352 +
    353 +void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner );
    354 +
    355 /* Macros after this point can all be overridden by user definitions in
    356 * section 1.
    357 */
    358 @@ -823,12 +821,7 @@
    359
    360 /* Amount of stuff to slurp up with each read. */
    361 #ifndef YY_READ_BUF_SIZE
    362 -#ifdef __ia64__
    363 -/* On IA-64, the buffer size is 16k, not 8k */
    364 -#define YY_READ_BUF_SIZE 16384
    365 -#else
    366 #define YY_READ_BUF_SIZE 8192
    367 -#endif /* __ia64__ */
    368 #endif
    369
    370 /* Copy whatever the last rule matched to the standard output. */
    371 @@ -847,7 +840,7 @@
    372 if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
    373 { \
    374 int c = '*'; \
    375 - size_t n; \
    376 + unsigned n; \
    377 for ( n = 0; n < max_size && \
    378 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
    379 buf[n] = (char) c; \
    380 @@ -945,7 +938,7 @@
    381
    382
    383
    384 -#line 949 "turtle_lexer.c"
    385 +#line 942 "turtle_lexer.c"
    386
    387 if ( !yyg->yy_init )
    388 {
    389 @@ -998,13 +991,13 @@
    390 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
    391 {
    392 yy_current_state = (int) yy_def[yy_current_state];
    393 - if ( yy_current_state >= 114 )
    394 + if ( yy_current_state >= 112 )
    395 yy_c = yy_meta[(unsigned int) yy_c];
    396 }
    397 yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
    398 ++yy_cp;
    399 }
    400 - while ( yy_current_state != 113 );
    401 + while ( yy_current_state != 111 );
    402 yy_cp = yyg->yy_last_accepting_cpos;
    403 yy_current_state = yyg->yy_last_accepting_state;
    404
    405 @@ -1321,7 +1314,7 @@
    406 while(1) {
    407 int c = yytext[yyleng - 1];
    408 if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
    409 - c == ':' || c == '-') {
    410 + c == '=') {
    411 yyleng--;
    412 } else
    413 break;
    414 @@ -1398,7 +1391,7 @@
    415 #line 439 "./turtle_lexer.l"
    416 YY_FATAL_ERROR( "flex scanner jammed" );
    417 YY_BREAK
    418 -#line 1402 "turtle_lexer.c"
    419 +#line 1395 "turtle_lexer.c"
    420 case YY_STATE_EOF(INITIAL):
    421 case YY_STATE_EOF(PREF):
    422 yyterminate();
    423 @@ -1694,7 +1687,7 @@
    424 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
    425 {
    426 yy_current_state = (int) yy_def[yy_current_state];
    427 - if ( yy_current_state >= 114 )
    428 + if ( yy_current_state >= 112 )
    429 yy_c = yy_meta[(unsigned int) yy_c];
    430 }
    431 yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
    432 @@ -1723,11 +1716,11 @@
    433 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
    434 {
    435 yy_current_state = (int) yy_def[yy_current_state];
    436 - if ( yy_current_state >= 114 )
    437 + if ( yy_current_state >= 112 )
    438 yy_c = yy_meta[(unsigned int) yy_c];
    439 }
    440 yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
    441 - yy_is_jam = (yy_current_state == 113);
    442 + yy_is_jam = (yy_current_state == 111);
    443
    444 return yy_is_jam ? 0 : yy_current_state;
    445 }
    446 @@ -2130,8 +2123,8 @@
    447
    448 /** Setup the input buffer state to scan the given bytes. The next call to turtle_lexer_lex() will
    449 * scan from a @e copy of @a bytes.
    450 - * @param yybytes the byte buffer to scan
    451 - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
    452 + * @param bytes the byte buffer to scan
    453 + * @param len the number of bytes in the buffer pointed to by @a bytes.
    454 * @param yyscanner The scanner object.
    455 * @return the newly allocated buffer state object.
    456 */
    457 diff -ur ../../raptor2-2.0.3/src/turtle_lexer.h ./src/turtle_lexer.h
    458 --- ../../raptor2-2.0.3/src/turtle_lexer.h 2011-05-31 21:14:41.000000000 +0200
    459 +++ ./src/turtle_lexer.h 2011-07-12 15:31:39.600648777 +0200
    460 @@ -58,6 +58,7 @@
    461 typedef unsigned char flex_uint8_t;
    462 typedef unsigned short int flex_uint16_t;
    463 typedef unsigned int flex_uint32_t;
    464 +#endif /* ! C99 */
    465
    466 /* Limits of integral types. */
    467 #ifndef INT8_MIN
    468 @@ -88,8 +89,6 @@
    469 #define UINT32_MAX (4294967295U)
    470 #endif
    471
    472 -#endif /* ! C99 */
    473 -
    474 #endif /* ! FLEXINT_H */
    475
    476 #ifdef __cplusplus
    477 @@ -132,15 +131,7 @@
    478
    479 /* Size of default input buffer. */
    480 #ifndef YY_BUF_SIZE
    481 -#ifdef __ia64__
    482 -/* On IA-64, the buffer size is 16k, not 8k.
    483 - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
    484 - * Ditto for the __ia64__ case accordingly.
    485 - */
    486 -#define YY_BUF_SIZE 32768
    487 -#else
    488 #define YY_BUF_SIZE 16384
    489 -#endif /* __ia64__ */
    490 #endif
    491
    492 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
    493 @@ -274,6 +265,10 @@
    494
    495 void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner );
    496
    497 +int turtle_lexer_get_column (yyscan_t yyscanner );
    498 +
    499 +void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner );
    500 +
    501 /* Macros after this point can all be overridden by user definitions in
    502 * section 1.
    503 */
    504 @@ -300,12 +295,7 @@
    505
    506 /* Amount of stuff to slurp up with each read. */
    507 #ifndef YY_READ_BUF_SIZE
    508 -#ifdef __ia64__
    509 -/* On IA-64, the buffer size is 16k, not 8k */
    510 -#define YY_READ_BUF_SIZE 16384
    511 -#else
    512 #define YY_READ_BUF_SIZE 8192
    513 -#endif /* __ia64__ */
    514 #endif
    515
    516 /* Number of entries by which start-condition stack grows. */
    517 @@ -341,6 +331,6 @@
    518 #line 439 "./turtle_lexer.l"
    519
    520
    521 -#line 345 "turtle_lexer.h"
    522 +#line 335 "turtle_lexer.h"
    523 #undef turtle_lexer_IN_HEADER
    524 #endif /* turtle_lexer_HEADER_H */
    525 diff -ur ../../raptor2-2.0.3/src/turtle_lexer.l ./src/turtle_lexer.l
    526 --- ../../raptor2-2.0.3/src/turtle_lexer.l 2011-05-31 21:14:36.000000000 +0200
    527 +++ ./src/turtle_lexer.l 2011-07-12 15:28:58.911660781 +0200
    528 @@ -345,7 +345,7 @@
    529 yyterminate(); }
    530
    531
    532 -{QUOTEDURI}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{" {
    533 +{QUOTEDURI}[\ \t\v\n]*("=")?[\ \t\v\n]*"{" {
    534 raptor_stringbuffer* sb;
    535 unsigned char* uri_string;
    536
    537 @@ -377,11 +377,11 @@
    538 TURTLE_LEXER_OOM();
    539 return GRAPH_NAME_LEFT_CURLY; }
    540
    541 -{QNAME}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{" {
    542 +{QNAME}[\ \t\v\n]*("=")?[\ \t\v\n]*"{" {
    543 while(1) {
    544 int c = yytext[yyleng - 1];
    545 if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
    546 - c == ':' || c == '-') {
    547 + c == '=') {
    548 yyleng--;
    549 } else
    550 break;