-rw-r--r-- | lib/sitecing_parser.ll | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sitecing_parser.ll b/lib/sitecing_parser.ll index 9514ce4..4fd6709 100644 --- a/lib/sitecing_parser.ll +++ b/lib/sitecing_parser.ll | |||
@@ -319,257 +319,257 @@ NOIDCHAR [^A-Za-z0-9_] | |||
319 | } | 319 | } |
320 | <IMPORTTYPECOMPONENT>{ | 320 | <IMPORTTYPECOMPONENT>{ |
321 | {WHITESPACE}+{ } | 321 | {WHITESPACE}+{ } |
322 | \n{ | 322 | \n{ |
323 | modus_operandi& m = M(); | 323 | modus_operandi& m = M(); |
324 | string::size_type t = m.output.find_first_not_of(" \t"); | 324 | string::size_type t = m.output.find_first_not_of(" \t"); |
325 | if(t!=string::npos) | 325 | if(t!=string::npos) |
326 | m.output.erase(0,t); | 326 | m.output.erase(0,t); |
327 | t = m.output.find_last_not_of(" \t;"); | 327 | t = m.output.find_last_not_of(" \t;"); |
328 | if(t!=string::npos) | 328 | if(t!=string::npos) |
329 | m.output.erase(t+1); | 329 | m.output.erase(t+1); |
330 | if(m.output[0]=='"' && m.output[m.output.length()-1]=='"') { | 330 | if(m.output[0]=='"' && m.output[m.output.length()-1]=='"') { |
331 | m.output.erase(0,1); | 331 | m.output.erase(0,1); |
332 | m.output.erase(m.output.length()-1); | 332 | m.output.erase(m.output.length()-1); |
333 | } | 333 | } |
334 | string c = combine_path(component_basename,m.output); | 334 | string c = combine_path(component_basename,m.output); |
335 | member_variables.push_back(member_variable(m._type,m._name,normalize_path(c,strip_leading_slash),true,true)); | 335 | member_variables.push_back(member_variable(m._type,m._name,normalize_path(c,strip_leading_slash),true,true)); |
336 | modi.pop_front(); | 336 | modi.pop_front(); |
337 | BEGIN(INITIAL); | 337 | BEGIN(INITIAL); |
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | <DERIVELINE>{ | 341 | <DERIVELINE>{ |
342 | {WHITESPACE}+{ } | 342 | {WHITESPACE}+{ } |
343 | {ID}{ | 343 | {ID}{ |
344 | modus_operandi& m = M(); | 344 | modus_operandi& m = M(); |
345 | if(!m._name.empty()) | 345 | if(!m._name.empty()) |
346 | throw preprocessor_error(CODEPOINT,"syntax_error",lineno()); | 346 | throw preprocessor_error(CODEPOINT,"syntax_error",lineno()); |
347 | m._name = yytext; | 347 | m._name = yytext; |
348 | } | 348 | } |
349 | \= { | 349 | \= { |
350 | M().output.clear(); | 350 | M().output.clear(); |
351 | BEGIN(DERIVECOMPONENT); | 351 | BEGIN(DERIVECOMPONENT); |
352 | } | 352 | } |
353 | } | 353 | } |
354 | <DERIVECOMPONENT>{ | 354 | <DERIVECOMPONENT>{ |
355 | {WHITESPACE}+{ } | 355 | {WHITESPACE}+{ } |
356 | \n { | 356 | \n { |
357 | modus_operandi& m = M(); | 357 | modus_operandi& m = M(); |
358 | string::size_type t = m.output.find_first_not_of(" \t"); | 358 | string::size_type t = m.output.find_first_not_of(" \t"); |
359 | if(t!=string::npos) | 359 | if(t!=string::npos) |
360 | m.output.erase(0,t); | 360 | m.output.erase(0,t); |
361 | t = m.output.find_last_not_of(" \t;"); | 361 | t = m.output.find_last_not_of(" \t;"); |
362 | if(t!=string::npos) | 362 | if(t!=string::npos) |
363 | m.output.erase(t+1); | 363 | m.output.erase(t+1); |
364 | if(m.output[0]=='"' && m.output[m.output.length()-1]=='"') { | 364 | if(m.output[0]=='"' && m.output[m.output.length()-1]=='"') { |
365 | m.output.erase(0,1); | 365 | m.output.erase(0,1); |
366 | m.output.erase(m.output.length()-1); | 366 | m.output.erase(m.output.length()-1); |
367 | } | 367 | } |
368 | string c = combine_path(component_basename,m.output); | 368 | string c = combine_path(component_basename,m.output); |
369 | ancestor_classes.push_back(ancestor_class(m._name,normalize_path(c,strip_leading_slash))); | 369 | ancestor_classes.push_back(ancestor_class(m._name,normalize_path(c,strip_leading_slash))); |
370 | modi.pop_front(); | 370 | modi.pop_front(); |
371 | BEGIN(INITIAL); | 371 | BEGIN(INITIAL); |
372 | } | 372 | } |
373 | } | 373 | } |
374 | 374 | ||
375 | <VARLINE>{ | 375 | <VARLINE>{ |
376 | {WHITESPACE}+{ | 376 | {WHITESPACE}+{ |
377 | modus_operandi& m = M(); | 377 | modus_operandi& m = M(); |
378 | if(!m.output.empty()) { | 378 | if(!m.output.empty()) { |
379 | if(!m._lastid.empty()) { | 379 | if(!m._lastid.empty()) { |
380 | if(!m._type.empty()) m._type += ' '; | 380 | if(!m._type.empty()) m._type += ' '; |
381 | m._type += m._lastid; | 381 | m._type += m._lastid; |
382 | } | 382 | } |
383 | m._lastid = m.output; | 383 | m._lastid = m.output; |
384 | m.output.clear(); | 384 | m.output.clear(); |
385 | } | 385 | } |
386 | } | 386 | } |
387 | \*{ | 387 | \*{ |
388 | modus_operandi& m = M(); | 388 | modus_operandi& m = M(); |
389 | ECHO; | 389 | ECHO; |
390 | if(!m._lastid.empty()) { | 390 | if(!m._lastid.empty()) { |
391 | if(!m._type.empty()) m._type += ' '; | 391 | if(!m._type.empty()) m._type += ' '; |
392 | m._type += m._lastid; | 392 | m._type += m._lastid; |
393 | } | 393 | } |
394 | m._lastid = m.output; | 394 | m._lastid = m.output; |
395 | m.output.clear(); | 395 | m.output.clear(); |
396 | } | 396 | } |
397 | \;|\n|\={ | 397 | \;|\n|\={ |
398 | modus_operandi& m = M(); | 398 | modus_operandi& m = M(); |
399 | if(m.output.empty()) { | 399 | if(m.output.empty()) { |
400 | m._name=m._lastid; | 400 | m._name=m._lastid; |
401 | }else{ | 401 | }else{ |
402 | if(!m._lastid.empty()) { // XXX: lastid should never be emtpy, I believe? | 402 | if(!m._lastid.empty()) { // XXX: lastid should never be emtpy, I believe? |
403 | if(!m._type.empty()) m._type += ' '; | 403 | if(!m._type.empty()) m._type += ' '; |
404 | m._type += m._lastid; | 404 | m._type += m._lastid; |
405 | } | 405 | } |
406 | m._name=m.output; | 406 | m._name=m.output; |
407 | m.output.clear(); | 407 | m.output.clear(); |
408 | } | 408 | } |
409 | BEGIN(VARINIT); | 409 | BEGIN(VARINIT); |
410 | if(*yytext!='=') | 410 | if(*yytext!='=') |
411 | unput('\n'); | 411 | unput('\n'); |
412 | } | 412 | } |
413 | } | 413 | } |
414 | <VARINIT>{ | 414 | <VARINIT>{ |
415 | \n{ | 415 | \n{ |
416 | modus_operandi& m = M(); | 416 | modus_operandi& m = M(); |
417 | string::size_type t = m.output.find_first_not_of(" \t"); | 417 | string::size_type t = m.output.find_first_not_of(" \t"); |
418 | if(t!=string::npos) | 418 | if(t!=string::npos) |
419 | m.output.erase(0,t); | 419 | m.output.erase(0,t); |
420 | t = m.output.find_last_not_of(" \t;"); | 420 | t = m.output.find_last_not_of(" \t;"); |
421 | if(t!=string::npos) | 421 | if(t!=string::npos) |
422 | m.output.erase(t+1); | 422 | m.output.erase(t+1); |
423 | member_variables.push_back(member_variable(m._type,m._name,m.output)); | 423 | member_variables.push_back(member_variable(m._type,m._name,m.output)); |
424 | if(!m.output.empty()) | 424 | if(!m.output.empty()) |
425 | have_initializers=true; | 425 | have_initializers=true; |
426 | modi.pop_front(); | 426 | modi.pop_front(); |
427 | BEGIN(INITIAL); | 427 | BEGIN(INITIAL); |
428 | } | 428 | } |
429 | } | 429 | } |
430 | <DECLLINE>\n{ | 430 | <DECLLINE>\n{ |
431 | ECHO; | 431 | ECHO; |
432 | decl += M().output; | 432 | decl += M().output; |
433 | modi.pop_front(); | 433 | modi.pop_front(); |
434 | BEGIN(INITIAL); | 434 | BEGIN(INITIAL); |
435 | } | 435 | } |
436 | <IMPLLINE>\n{ | 436 | <IMPLLINE>\n{ |
437 | ECHO; | 437 | ECHO; |
438 | impl += M().output; | 438 | impl += M().output; |
439 | modi.pop_front(); | 439 | modi.pop_front(); |
440 | BEGIN(INITIAL); | 440 | BEGIN(INITIAL); |
441 | } | 441 | } |
442 | <CLASSLINE>\n{ | 442 | <CLASSLINE>\n{ |
443 | class_name = M().output; | 443 | class_name = M().output; |
444 | modi.pop_front(); | 444 | modi.pop_front(); |
445 | BEGIN(INITIAL); | 445 | BEGIN(INITIAL); |
446 | } | 446 | } |
447 | <CLASSLINE,DECLLINE,IMPLLINE,VARLINE,VARINIT,IMPORTLINE,IMPORTCOMPONENT,CODEMETHODLINE,CODEMETHODARGS,INLINE,METHODLINE,METHODARGS,DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,CODELINE,CODEBLOCK,PRAGMALINE>{ | 447 | <CLASSLINE,DECLLINE,IMPLLINE,VARLINE,VARINIT,IMPORTLINE,IMPORTCOMPONENT,CODEMETHODLINE,CODEMETHODARGS,INLINE,METHODLINE,METHODARGS,DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,CODELINE,CODEBLOCK,PRAGMALINE,DERIVELINE,DERIVECOMPONENT>{ |
448 | "/*"{ | 448 | "/*"{ |
449 | yy_push_state(SLASHSTAR_COMMENT); | 449 | yy_push_state(SLASHSTAR_COMMENT); |
450 | if(!M().devour_comments()) { | 450 | if(!M().devour_comments()) { |
451 | ECHO; | 451 | ECHO; |
452 | } | 452 | } |
453 | } | 453 | } |
454 | "//"{ | 454 | "//"{ |
455 | yy_push_state(SLASHSLASH_COMMENT); | 455 | yy_push_state(SLASHSLASH_COMMENT); |
456 | if(!M().devour_comments()) { | 456 | if(!M().devour_comments()) { |
457 | ECHO; | 457 | ECHO; |
458 | } | 458 | } |
459 | } | 459 | } |
460 | \" { | 460 | \" { |
461 | yy_push_state(STRING); | 461 | yy_push_state(STRING); |
462 | ECHO; | 462 | ECHO; |
463 | } | 463 | } |
464 | \'\\.\'{ | 464 | \'\\.\'{ |
465 | ECHO; | 465 | ECHO; |
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | <INITIAL,METHODBLOCK,OUTPUTBLOCK>{ | 469 | <INITIAL,METHODBLOCK,OUTPUTBLOCK>{ |
470 | \"soft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\\"",2); | 470 | \"soft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\\"",2); |
471 | \nsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\n",2); | 471 | \nsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\n",2); |
472 | \rsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\r",2); | 472 | \rsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\r",2); |
473 | \tsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\t",2); | 473 | \tsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\t",2); |
474 | \bsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\b",2); | 474 | \bsoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\b",2); |
475 | \asoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\a",2); | 475 | \asoft_anchor(); M().modify(modus_operandi::modus_text); LexerOutput("\\a",2); |
476 | .soft_anchor(); M().modify(modus_operandi::modus_text); ECHO; | 476 | .soft_anchor(); M().modify(modus_operandi::modus_text); ECHO; |
477 | {WHITESPACE}+soft_anchor(); M().modify(modus_operandi::modus_text); ECHO; | 477 | {WHITESPACE}+soft_anchor(); M().modify(modus_operandi::modus_text); ECHO; |
478 | } | 478 | } |
479 | 479 | ||
480 | <DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,METHODBLOCK,CODEBLOCK>{ | 480 | <DECLBLOCK,IMPLBLOCK,CONSTRUCTOR,DESTRUCTOR,CODEMETHODBLOCK,METHODBLOCK,CODEBLOCK>{ |
481 | \<\/\%decl\>{ | 481 | \<\/\%decl\>{ |
482 | if(YY_START!=DECLBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 482 | if(YY_START!=DECLBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
483 | decl += M().output; | 483 | decl += M().output; |
484 | modi.pop_front(); | 484 | modi.pop_front(); |
485 | BEGIN(INITIAL); | 485 | BEGIN(INITIAL); |
486 | } | 486 | } |
487 | \<\/\%impl\>{ | 487 | \<\/\%impl\>{ |
488 | if(YY_START!=IMPLBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 488 | if(YY_START!=IMPLBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
489 | impl += M().output; | 489 | impl += M().output; |
490 | modi.pop_front(); | 490 | modi.pop_front(); |
491 | BEGIN(INITIAL); | 491 | BEGIN(INITIAL); |
492 | } | 492 | } |
493 | \<\/\%constructor\>{ | 493 | \<\/\%constructor\>{ |
494 | if(YY_START!=CONSTRUCTOR) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 494 | if(YY_START!=CONSTRUCTOR) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
495 | member_functions.push_back(member_function("","","",M().output)); | 495 | member_functions.push_back(member_function("","","",M().output)); |
496 | have_constructor = true; | 496 | have_constructor = true; |
497 | modi.pop_front(); | 497 | modi.pop_front(); |
498 | BEGIN(INITIAL); | 498 | BEGIN(INITIAL); |
499 | } | 499 | } |
500 | \<\/\%destructor\>{ | 500 | \<\/\%destructor\>{ |
501 | if(YY_START!=DESTRUCTOR) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 501 | if(YY_START!=DESTRUCTOR) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
502 | member_functions.push_back(member_function("","~","",M().output)); | 502 | member_functions.push_back(member_function("","~","",M().output)); |
503 | modi.pop_front(); | 503 | modi.pop_front(); |
504 | BEGIN(INITIAL); | 504 | BEGIN(INITIAL); |
505 | } | 505 | } |
506 | \<\/\%codemethod\>{ | 506 | \<\/\%codemethod\>{ |
507 | if(YY_START!=CODEMETHODBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 507 | if(YY_START!=CODEMETHODBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
508 | modus_operandi& m = M(); | 508 | modus_operandi& m = M(); |
509 | member_functions.push_back(member_function(m._type,m._name,m._args,m.output)); | 509 | member_functions.push_back(member_function(m._type,m._name,m._args,m.output)); |
510 | modi.pop_front(); | 510 | modi.pop_front(); |
511 | BEGIN(INITIAL); | 511 | BEGIN(INITIAL); |
512 | } | 512 | } |
513 | \<\/%method\> { | 513 | \<\/%method\> { |
514 | if(YY_START!=METHODBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 514 | if(YY_START!=METHODBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
515 | modus_operandi& m = M(); | 515 | modus_operandi& m = M(); |
516 | m.modify(modus_operandi::modus_code); | 516 | m.modify(modus_operandi::modus_code); |
517 | member_functions.push_back(member_function(m._type,m._name,m._args,m.output)); | 517 | member_functions.push_back(member_function(m._type,m._name,m._args,m.output)); |
518 | modi.pop_front(); | 518 | modi.pop_front(); |
519 | BEGIN(INITIAL); | 519 | BEGIN(INITIAL); |
520 | } | 520 | } |
521 | \<\/%code\> { | 521 | \<\/%code\> { |
522 | if(YY_START!=CODEBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); | 522 | if(YY_START!=CODEBLOCK) throw preprocessor_error(CODEPOINT,"tags mismatch",lineno()); |
523 | yy_pop_state(); | 523 | yy_pop_state(); |
524 | } | 524 | } |
525 | \n ECHO; | 525 | \n ECHO; |
526 | } | 526 | } |
527 | 527 | ||
528 | <SLASHSTAR_COMMENT>{ | 528 | <SLASHSTAR_COMMENT>{ |
529 | "*/"{ | 529 | "*/"{ |
530 | if(!M().devour_comments()) { | 530 | if(!M().devour_comments()) { |
531 | ECHO; | 531 | ECHO; |
532 | } | 532 | } |
533 | yy_pop_state(); | 533 | yy_pop_state(); |
534 | unput(' '); | 534 | unput(' '); |
535 | } | 535 | } |
536 | \n{ | 536 | \n{ |
537 | if(!M().devour_comments()) { | 537 | if(!M().devour_comments()) { |
538 | ECHO; | 538 | ECHO; |
539 | } | 539 | } |
540 | } | 540 | } |
541 | } | 541 | } |
542 | <SLASHSLASH_COMMENT>{ | 542 | <SLASHSLASH_COMMENT>{ |
543 | \n{ | 543 | \n{ |
544 | if(!M().devour_comments()) { | 544 | if(!M().devour_comments()) { |
545 | ECHO; | 545 | ECHO; |
546 | } | 546 | } |
547 | yy_pop_state(); | 547 | yy_pop_state(); |
548 | if(YY_START!=CODEBLOCK && YY_START!=CODEMETHODBLOCK && YY_START!=IMPLBLOCK && YY_START!=DECLBLOCK) | 548 | if(YY_START!=CODEBLOCK && YY_START!=CODEMETHODBLOCK && YY_START!=IMPLBLOCK && YY_START!=DECLBLOCK) |
549 | unput('\n'); | 549 | unput('\n'); |
550 | } | 550 | } |
551 | } | 551 | } |
552 | <SLASHSTAR_COMMENT,SLASHSLASH_COMMENT>.{ | 552 | <SLASHSTAR_COMMENT,SLASHSLASH_COMMENT>.{ |
553 | if(!M().devour_comments()) { | 553 | if(!M().devour_comments()) { |
554 | ECHO; | 554 | ECHO; |
555 | } | 555 | } |
556 | } | 556 | } |
557 | <STRING>{ | 557 | <STRING>{ |
558 | \\.ECHO; | 558 | \\.ECHO; |
559 | \"ECHO; yy_pop_state(); | 559 | \"ECHO; yy_pop_state(); |
560 | .ECHO; | 560 | .ECHO; |
561 | } | 561 | } |
562 | 562 | ||
563 | {WHITESPACE}+{ | 563 | {WHITESPACE}+{ |
564 | if(!(M().flags&modus_operandi::flag_devour_whitespace)) { | 564 | if(!(M().flags&modus_operandi::flag_devour_whitespace)) { |
565 | ECHO; | 565 | ECHO; |
566 | } | 566 | } |
567 | } | 567 | } |
568 | 568 | ||
569 | %% | 569 | %% |
570 | 570 | ||
571 | sitecing_parser::sitecing_parser(component_factory& f) | 571 | sitecing_parser::sitecing_parser(component_factory& f) |
572 | : factory(f), have_initializers(false), have_constructor(false), | 572 | : factory(f), have_initializers(false), have_constructor(false), |
573 | base_class("sitecing::cgi_component"), | 573 | base_class("sitecing::cgi_component"), |
574 | base_header("sitecing/cgi_component.h"), | 574 | base_header("sitecing/cgi_component.h"), |
575 | skeleton(__SC_DEFAULT_SKELETON) { | 575 | skeleton(__SC_DEFAULT_SKELETON) { |