Skip to content

Commit 5d5e0ae

Browse files
shinobushinobu
committed
testfile does now work, first strings are parsable, lexer eats IRIREF right now (throws out the token but its empty)
1 parent d55975e commit 5d5e0ae

File tree

7 files changed

+2281
-2544
lines changed

7 files changed

+2281
-2544
lines changed

‎SparqlPHPParserMain.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ class SparqlPHPParserMain {
1010

1111
private function parse($fp) {
1212
if (!isset($parser)) {
13-
$this->parser = new SparqlPHPParserParser($this);
13+
$this->parser = new SparqlPHPParser($this);
1414
}
1515
$scanner = new SparqlLexer($fp);
1616
while ($x = $scanner->nextToken())
1717
{
18-
if($x->type != SparqlPHPParser::TK_FAIL) {
19-
$this->parser->SparqlPHP($x->type, $x);
18+
if($x->type != -1) {
19+
$this->parser->doParse($x->type, $x);
2020
} else {
2121
$err = 'Invalid Input in line ' . $x->line . '. Problem with: ' . $x->value . fgets($fp, 15);
22-
throw Exception($err);
22+
throw new Exception($err);
2323
}
2424
}
25-
$this->parser->SparqlPHP(0);
25+
$this->parser->doParse(0);
2626

2727
}
2828

‎lib/sparql.lex.php

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6492,7 +6492,7 @@ public function /*Yytoken*/ nextToken ()
64926492
case -3:
64936493
break;
64946494
case 3:
6495-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
6495+
{ /* unmatchable Character */ return $this->createToken(-1); }
64966496
case -4:
64976497
break;
64986498
case 4:
@@ -7140,7 +7140,7 @@ public function /*Yytoken*/ nextToken ()
71407140
case -165:
71417141
break;
71427142
case 166:
7143-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7143+
{ /* unmatchable Character */ return $this->createToken(-1); }
71447144
case -166:
71457145
break;
71467146
case 167:
@@ -7172,59 +7172,59 @@ public function /*Yytoken*/ nextToken ()
71727172
case -173:
71737173
break;
71747174
case 175:
7175-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7175+
{ /* unmatchable Character */ return $this->createToken(-1); }
71767176
case -174:
71777177
break;
71787178
case 176:
71797179
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
71807180
case -175:
71817181
break;
71827182
case 178:
7183-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7183+
{ /* unmatchable Character */ return $this->createToken(-1); }
71847184
case -176:
71857185
break;
71867186
case 179:
71877187
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
71887188
case -177:
71897189
break;
71907190
case 181:
7191-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7191+
{ /* unmatchable Character */ return $this->createToken(-1); }
71927192
case -178:
71937193
break;
71947194
case 183:
7195-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7195+
{ /* unmatchable Character */ return $this->createToken(-1); }
71967196
case -179:
71977197
break;
71987198
case 185:
7199-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7199+
{ /* unmatchable Character */ return $this->createToken(-1); }
72007200
case -180:
72017201
break;
72027202
case 187:
7203-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7203+
{ /* unmatchable Character */ return $this->createToken(-1); }
72047204
case -181:
72057205
break;
72067206
case 189:
7207-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7207+
{ /* unmatchable Character */ return $this->createToken(-1); }
72087208
case -182:
72097209
break;
72107210
case 191:
7211-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7211+
{ /* unmatchable Character */ return $this->createToken(-1); }
72127212
case -183:
72137213
break;
72147214
case 193:
7215-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7215+
{ /* unmatchable Character */ return $this->createToken(-1); }
72167216
case -184:
72177217
break;
72187218
case 195:
7219-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7219+
{ /* unmatchable Character */ return $this->createToken(-1); }
72207220
case -185:
72217221
break;
72227222
case 197:
7223-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7223+
{ /* unmatchable Character */ return $this->createToken(-1); }
72247224
case -186:
72257225
break;
72267226
case 199:
7227-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7227+
{ /* unmatchable Character */ return $this->createToken(-1); }
72287228
case -187:
72297229
break;
72307230
case 335:
@@ -7236,91 +7236,91 @@ public function /*Yytoken*/ nextToken ()
72367236
case -189:
72377237
break;
72387238
case 337:
7239-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7239+
{ /* unmatchable Character */ return $this->createToken(-1); }
72407240
case -190:
72417241
break;
72427242
case 343:
72437243
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
72447244
case -191:
72457245
break;
72467246
case 344:
7247-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7247+
{ /* unmatchable Character */ return $this->createToken(-1); }
72487248
case -192:
72497249
break;
72507250
case 347:
7251-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7251+
{ /* unmatchable Character */ return $this->createToken(-1); }
72527252
case -193:
72537253
break;
72547254
case 349:
7255-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7255+
{ /* unmatchable Character */ return $this->createToken(-1); }
72567256
case -194:
72577257
break;
72587258
case 351:
7259-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7259+
{ /* unmatchable Character */ return $this->createToken(-1); }
72607260
case -195:
72617261
break;
72627262
case 433:
72637263
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
72647264
case -196:
72657265
break;
72667266
case 434:
7267-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7267+
{ /* unmatchable Character */ return $this->createToken(-1); }
72687268
case -197:
72697269
break;
72707270
case 437:
72717271
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
72727272
case -198:
72737273
break;
72747274
case 438:
7275-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7275+
{ /* unmatchable Character */ return $this->createToken(-1); }
72767276
case -199:
72777277
break;
72787278
case 440:
7279-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7279+
{ /* unmatchable Character */ return $this->createToken(-1); }
72807280
case -200:
72817281
break;
72827282
case 442:
7283-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7283+
{ /* unmatchable Character */ return $this->createToken(-1); }
72847284
case -201:
72857285
break;
72867286
case 444:
7287-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7287+
{ /* unmatchable Character */ return $this->createToken(-1); }
72887288
case -202:
72897289
break;
72907290
case 446:
7291-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7291+
{ /* unmatchable Character */ return $this->createToken(-1); }
72927292
case -203:
72937293
break;
72947294
case 500:
72957295
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
72967296
case -204:
72977297
break;
72987298
case 501:
7299-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7299+
{ /* unmatchable Character */ return $this->createToken(-1); }
73007300
case -205:
73017301
break;
73027302
case 503:
7303-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7303+
{ /* unmatchable Character */ return $this->createToken(-1); }
73047304
case -206:
73057305
break;
73067306
case 505:
7307-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7307+
{ /* unmatchable Character */ return $this->createToken(-1); }
73087308
case -207:
73097309
break;
73107310
case 537:
73117311
{ return $this->createToken(SparqlPHPParser::TK_LANGTAG); }
73127312
case -208:
73137313
break;
73147314
case 538:
7315-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7315+
{ /* unmatchable Character */ return $this->createToken(-1); }
73167316
case -209:
73177317
break;
73187318
case 540:
7319-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7319+
{ /* unmatchable Character */ return $this->createToken(-1); }
73207320
case -210:
73217321
break;
73227322
case 542:
7323-
{ /* unmatchable Character */ return $this->createToken(SparqlPHPParser::TK_FAIL); }
7323+
{ /* unmatchable Character */ return $this->createToken(-1); }
73247324
case -211:
73257325
break;
73267326
default:

0 commit comments

Comments
 (0)