r5240 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r5239‎ | r5240 | r5241 >
Date:22:10, 15 September 2004
Author:timwi
Status:old
Tags:
Comment:
This commit doesn't actually change anything significant. I made a separate commit
for these changes so that the previous patch would be more readable.
Modified paths:
  • /trunk/flexbisonparse/wikiparse.y (modified) (history)

Diff [purge]

Index: trunk/flexbisonparse/wikiparse.y
——@@ -563,6 +563,7 @@
564564 textelement : TEXT { debugf ("textelement#1 "); $$ = $1; }
565565 | EXTENSION { debugf ("textelement#2 "); $$ = $1; }
566566 | PIPE { debugf ("textelement#3 "); $$ = newNodeS (TextToken, "|"); }
 567+ | CLOSEDBLSQBR { debugf ("textelement#4 "); $$ = newNodeS (TextToken, "]]"); }
567568 | APO2 { debugf ("textelement#5 "); $$ = newNodeS (TextToken, "''"); }
568569 | APO3 { debugf ("textelement#6 "); $$ = newNodeS (TextToken, "'''"); }
569570 | APO5 { debugf ("textelement#7 "); $$ = newNodeS (TextToken, "'''''"); }
——@@ -576,11 +577,11 @@
577578 | comment { debugf ("textelement#15 "); $$ = $1; }
578579 | linketc { debugf ("textelement#16 "); $$ = $1; }
579580 | italicsorbold { debugf ("textelement#17 "); $$ = $1; }
580 - | CLOSEDBLSQBR { debugf ("textelement#18 "); $$ = newNodeS (TextToken, "]]"); }
581581
582582 textelementnoital : TEXT { debugf ("textelementnoital#1 "); $$ = $1; }
583583 | EXTENSION { debugf ("textelementnoital#2 "); $$ = $1; }
584584 | PIPE { debugf ("textelementnoital#3 "); $$ = newNodeS (TextToken, "|"); }
 585+ | CLOSEDBLSQBR { debugf ("textelementnoital#4 "); $$ = newNodeS (TextToken, "]]"); }
585586 | TABLEBEGIN { debugf ("textelementnoital#5 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
586587 | TABLEEND { debugf ("textelementnoital#6 "); $$ = newNodeS (TextToken, "|}"); }
587588 | TABLEROW { debugf ("textelementnoital#7 "); $$ = convertTableRowToText ($1); }
——@@ -589,11 +590,11 @@
590591 | comment { debugf ("textelementnoital#10 "); $$ = $1; }
591592 | linketc { debugf ("textelementnoital#11 "); $$ = $1; }
592593 | boldnoitalics { debugf ("textelementnoital#12 "); $$ = $1; }
593 - | CLOSEDBLSQBR { debugf ("textelementnoital#13 "); $$ = newNodeS (TextToken, "]]"); }
594594
595595 textelementnobold : TEXT { debugf ("textelementnobold#1 "); $$ = $1; }
596596 | EXTENSION { debugf ("textelementnobold#2 "); $$ = $1; }
597597 | PIPE { debugf ("textelementnobold#3 "); $$ = newNodeS (TextToken, "|"); }
 598+ | CLOSEDBLSQBR { debugf ("textelementnobold#4 "); $$ = newNodeS (TextToken, "]]"); }
598599 | TABLEBEGIN { debugf ("textelementnobold#5 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
599600 | TABLEEND { debugf ("textelementnobold#6 "); $$ = newNodeS (TextToken, "|}"); }
600601 | TABLEROW { debugf ("textelementnobold#7 "); $$ = convertTableRowToText ($1); }
——@@ -602,11 +603,11 @@
603604 | comment { debugf ("textelementnobold#10 "); $$ = $1; }
604605 | linketc { debugf ("textelementnobold#11 "); $$ = $1; }
605606 | italicsnobold { debugf ("textelementnobold#12 "); $$ = $1; }
606 - | CLOSEDBLSQBR { debugf ("textelementnobold#13 "); $$ = newNodeS (TextToken, "]]"); }
607607
608608 textelementnoboit : TEXT { debugf ("textelementnoboit#1 "); $$ = $1; }
609609 | EXTENSION { debugf ("textelementnoboit#2 "); $$ = $1; }
610610 | PIPE { debugf ("textelementnoboit#3 "); $$ = newNodeS (TextToken, "|"); }
 611+ | CLOSEDBLSQBR { debugf ("textelementnoboit#4 "); $$ = newNodeS (TextToken, "]]"); }
611612 | TABLEBEGIN { debugf ("textelementnoboit#5 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
612613 | TABLEEND { debugf ("textelementnoboit#6 "); $$ = newNodeS (TextToken, "|}"); }
613614 | TABLEROW { debugf ("textelementnoboit#7 "); $$ = convertTableRowToText ($1); }
——@@ -614,11 +615,11 @@
615616 | TABLEHEAD { debugf ("textelementnoboit#9 "); $$ = convertTableHeadToText ($1); }
616617 | comment { debugf ("textelementnoboit#10 "); $$ = $1; }
617618 | linketc { debugf ("textelementnoboit#11 "); $$ = $1; }
618 - | CLOSEDBLSQBR { debugf ("textelementnoboit#12 "); $$ = newNodeS (TextToken, "]]"); }
619619
620620 textelementnotbl : TEXT { debugf ("textelementnotbl#1 "); $$ = $1; }
621621 | EXTENSION { debugf ("textelementnotbl#2 "); $$ = $1; }
622622 | PIPE { debugf ("textelementnotbl#3 "); $$ = newNodeS (TextToken, "|"); }
 623+ | CLOSEDBLSQBR { debugf ("textelementnotbl#4 "); $$ = newNodeS (TextToken, "]]"); }
623624 | APO2 { debugf ("textelementnotbl#5 "); $$ = newNodeS (TextToken, "''"); }
624625 | APO3 { debugf ("textelementnotbl#6 "); $$ = newNodeS (TextToken, "'''"); }
625626 | APO5 { debugf ("textelementnotbl#7 "); $$ = newNodeS (TextToken, "'''''"); }
——@@ -626,119 +627,118 @@
627628 | comment { debugf ("textelementnotbl#9 "); $$ = $1; }
628629 | linketcnotbl { debugf ("textelementnotbl#10 "); $$ = $1; }
629630 | italorboldnotbl { debugf ("textelementnotbl#11 "); $$ = $1; }
630 - | CLOSEDBLSQBR { debugf ("textelementnotbl#12 "); $$ = newNodeS (TextToken, "]]"); }
631631
632632 textelementnoitaltbl: TEXT { debugf ("textelementnoitaltbl#1 "); $$ = $1; }
633633 | EXTENSION { debugf ("textelementnoitaltbl#2 "); $$ = $1; }
634634 | PIPE { debugf ("textelementnoitaltbl#3 "); $$ = newNodeS (TextToken, "|"); }
 635+ | CLOSEDBLSQBR { debugf ("textelementnoitaltbl#4 "); $$ = newNodeS (TextToken, "]]"); }
635636 | comment { debugf ("textelementnoitaltbl#5 "); $$ = $1; }
636637 | linketcnotbl { debugf ("textelementnoitaltbl#6 "); $$ = $1; }
637638 | boldnoitalicstbl{ debugf ("textelementnoitaltbl#7 "); $$ = $1; }
638 - | CLOSEDBLSQBR { debugf ("textelementnoitaltbl#8 "); $$ = newNodeS (TextToken, "]]"); }
639639
640640 textelementnoboldtbl: TEXT { debugf ("textelementnoboldtbl#1 "); $$ = $1; }
641641 | EXTENSION { debugf ("textelementnoboldtbl#2 "); $$ = $1; }
642642 | PIPE { debugf ("textelementnoboldtbl#3 "); $$ = newNodeS (TextToken, "|"); }
 643+ | CLOSEDBLSQBR { debugf ("textelementnoboldtbl#4 "); $$ = newNodeS (TextToken, "]]"); }
643644 | comment { debugf ("textelementnoboldtbl#5 "); $$ = $1; }
644645 | linketcnotbl { debugf ("textelementnoboldtbl#6 "); $$ = $1; }
645646 | italicsnoboldtbl{ debugf ("textelementnoboldtbl#7 "); $$ = $1; }
646 - | CLOSEDBLSQBR { debugf ("textelementnoboldtbl#8 "); $$ = newNodeS (TextToken, "]]"); }
647647
648648 textelementnoboittbl: TEXT { debugf ("textelementnoboittbl#1 "); $$ = $1; }
649649 | EXTENSION { debugf ("textelementnoboittbl#2 "); $$ = $1; }
650650 | PIPE { debugf ("textelementnoboittbl#3 "); $$ = newNodeS (TextToken, "|"); }
 651+ | CLOSEDBLSQBR { debugf ("textelementnoboittbl#4 "); $$ = newNodeS (TextToken, "]]"); }
651652 | comment { debugf ("textelementnoboittbl#5 "); $$ = $1; }
652653 | linketcnotbl { debugf ("textelementnoboittbl#6 "); $$ = $1; }
653 - | CLOSEDBLSQBR { debugf ("textelementnoboittbl#7 "); $$ = newNodeS (TextToken, "]]"); }
654654
655655 textelementnopipe : TEXT { debugf ("textelementnopipe#1 "); $$ = $1; }
656656 | EXTENSION { debugf ("textelementnopipe#2 "); $$ = $1; }
657 - | APO2 { debugf ("textelementnopipe#5 "); $$ = newNodeS (TextToken, "''"); }
658 - | APO3 { debugf ("textelementnopipe#6 "); $$ = newNodeS (TextToken, "'''"); }
659 - | APO5 { debugf ("textelementnopipe#7 "); $$ = newNodeS (TextToken, "'''''"); }
660 - | EQUALS { debugf ("textelementnopipe#8 "); $$ = newNodeS (TextToken, addSpaces ("=", $1)); }
661 - | TABLEBEGIN { debugf ("textelementnopipe#9 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
662 - | TABLEEND { debugf ("textelementnopipe#10 "); $$ = newNodeS (TextToken, "|}"); }
663 - | TABLEROW { debugf ("textelementnopipe#11 "); $$ = convertTableRowToText ($1); }
664 - | TABLECELL { debugf ("textelementnopipe#12 "); $$ = convertTableCellToText ($1); }
665 - | TABLEHEAD { debugf ("textelementnopipe#13 "); $$ = convertTableHeadToText ($1); }
666 - | ATTRIBUTE { debugf ("textelementnopipe#14 "); $$ = convertAttributeDataToText ($1); }
667 - | comment { debugf ("textelementnopipe#15 "); $$ = $1; }
668 - | linketc { debugf ("textelementnopipe#16 "); $$ = $1; }
669 - | italorboldnopipe{ debugf ("textelementnopipe#17 "); $$ = $1; }
 657+ | APO2 { debugf ("textelementnopipe#3 "); $$ = newNodeS (TextToken, "''"); }
 658+ | APO3 { debugf ("textelementnopipe#4 "); $$ = newNodeS (TextToken, "'''"); }
 659+ | APO5 { debugf ("textelementnopipe#5 "); $$ = newNodeS (TextToken, "'''''"); }
 660+ | EQUALS { debugf ("textelementnopipe#6 "); $$ = newNodeS (TextToken, addSpaces ("=", $1)); }
 661+ | TABLEBEGIN { debugf ("textelementnopipe#7 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
 662+ | TABLEEND { debugf ("textelementnopipe#8 "); $$ = newNodeS (TextToken, "|}"); }
 663+ | TABLEROW { debugf ("textelementnopipe#9 "); $$ = convertTableRowToText ($1); }
 664+ | TABLECELL { debugf ("textelementnopipe#10 "); $$ = convertTableCellToText ($1); }
 665+ | TABLEHEAD { debugf ("textelementnopipe#11 "); $$ = convertTableHeadToText ($1); }
 666+ | ATTRIBUTE { debugf ("textelementnopipe#12 "); $$ = convertAttributeDataToText ($1); }
 667+ | comment { debugf ("textelementnopipe#13 "); $$ = $1; }
 668+ | linketc { debugf ("textelementnopipe#14 "); $$ = $1; }
 669+ | italorboldnopipe{ debugf ("textelementnopipe#15 "); $$ = $1; }
670670
671671 textelementnoitp : TEXT { debugf ("textelementnoitp#1 "); $$ = $1; }
672672 | EXTENSION { debugf ("textelementnoitp#2 "); $$ = $1; }
673 - | TABLEBEGIN { debugf ("textelementnoitp#5 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
674 - | TABLEEND { debugf ("textelementnoitp#6 "); $$ = newNodeS (TextToken, "|}"); }
675 - | TABLEROW { debugf ("textelementnoitp#7 "); $$ = convertTableRowToText ($1); }
676 - | TABLECELL { debugf ("textelementnoitp#8 "); $$ = convertTableCellToText ($1); }
677 - | TABLEHEAD { debugf ("textelementnoitp#9 "); $$ = convertTableHeadToText ($1); }
678 - | comment { debugf ("textelementnoitp#10 "); $$ = $1; }
679 - | linketc { debugf ("textelementnoitp#11 "); $$ = $1; }
680 - | boldnoitalicspp { debugf ("textelementnoitp#12 "); $$ = $1; }
 673+ | TABLEBEGIN { debugf ("textelementnoitp#3 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
 674+ | TABLEEND { debugf ("textelementnoitp#4 "); $$ = newNodeS (TextToken, "|}"); }
 675+ | TABLEROW { debugf ("textelementnoitp#5 "); $$ = convertTableRowToText ($1); }
 676+ | TABLECELL { debugf ("textelementnoitp#6 "); $$ = convertTableCellToText ($1); }
 677+ | TABLEHEAD { debugf ("textelementnoitp#7 "); $$ = convertTableHeadToText ($1); }
 678+ | comment { debugf ("textelementnoitp#8 "); $$ = $1; }
 679+ | linketc { debugf ("textelementnoitp#9 "); $$ = $1; }
 680+ | boldnoitalicspp { debugf ("textelementnoitp#10 "); $$ = $1; }
681681
682682 textelementnobldp : TEXT { debugf ("textelementnobldp#1 "); $$ = $1; }
683683 | EXTENSION { debugf ("textelementnobldp#2 "); $$ = $1; }
684 - | TABLEBEGIN { debugf ("textelementnobldp#5 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
685 - | TABLEEND { debugf ("textelementnobldp#6 "); $$ = newNodeS (TextToken, "|}"); }
686 - | TABLEROW { debugf ("textelementnobldp#7 "); $$ = convertTableRowToText ($1); }
687 - | TABLECELL { debugf ("textelementnobldp#8 "); $$ = convertTableCellToText ($1); }
688 - | TABLEHEAD { debugf ("textelementnobldp#9 "); $$ = convertTableHeadToText ($1); }
689 - | comment { debugf ("textelementnobldp#10 "); $$ = $1; }
690 - | linketc { debugf ("textelementnobldp#11 "); $$ = $1; }
691 - | italicsnoboldpp { debugf ("textelementnobldp#12 "); $$ = $1; }
 684+ | TABLEBEGIN { debugf ("textelementnobldp#3 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
 685+ | TABLEEND { debugf ("textelementnobldp#4 "); $$ = newNodeS (TextToken, "|}"); }
 686+ | TABLEROW { debugf ("textelementnobldp#5 "); $$ = convertTableRowToText ($1); }
 687+ | TABLECELL { debugf ("textelementnobldp#6 "); $$ = convertTableCellToText ($1); }
 688+ | TABLEHEAD { debugf ("textelementnobldp#7 "); $$ = convertTableHeadToText ($1); }
 689+ | comment { debugf ("textelementnobldp#8 "); $$ = $1; }
 690+ | linketc { debugf ("textelementnobldp#9 "); $$ = $1; }
 691+ | italicsnoboldpp { debugf ("textelementnobldp#10 "); $$ = $1; }
692692
693693 textelementnobitp : TEXT { debugf ("textelementnobitp#1 "); $$ = $1; }
694694 | EXTENSION { debugf ("textelementnobitp#2 "); $$ = $1; }
695 - | TABLEBEGIN { debugf ("textelementnobitp#5 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
696 - | TABLEEND { debugf ("textelementnobitp#6 "); $$ = newNodeS (TextToken, "|}"); }
697 - | TABLEROW { debugf ("textelementnobitp#7 "); $$ = convertTableRowToText ($1); }
698 - | TABLECELL { debugf ("textelementnobitp#8 "); $$ = convertTableCellToText ($1); }
699 - | TABLEHEAD { debugf ("textelementnobitp#9 "); $$ = convertTableHeadToText ($1); }
700 - | comment { debugf ("textelementnobitp#10 "); $$ = $1; }
701 - | linketc { debugf ("textelementnobitp#11 "); $$ = $1; }
 695+ | TABLEBEGIN { debugf ("textelementnobitp#3 "); $$ = newNodeS (TextToken, addSpaces ("{|", $1)); }
 696+ | TABLEEND { debugf ("textelementnobitp#4 "); $$ = newNodeS (TextToken, "|}"); }
 697+ | TABLEROW { debugf ("textelementnobitp#5 "); $$ = convertTableRowToText ($1); }
 698+ | TABLECELL { debugf ("textelementnobitp#6 "); $$ = convertTableCellToText ($1); }
 699+ | TABLEHEAD { debugf ("textelementnobitp#7 "); $$ = convertTableHeadToText ($1); }
 700+ | comment { debugf ("textelementnobitp#8 "); $$ = $1; }
 701+ | linketc { debugf ("textelementnobitp#9 "); $$ = $1; }
702702
703703 textelementnotblpipe: TEXT { debugf ("textelementnotblpipe#1 "); $$ = $1; }
704704 | EXTENSION { debugf ("textelementnotblpipe#2 "); $$ = $1; }
705705 | PIPE { debugf ("textelementnotblpipe#3 "); $$ = newNodeS (TextToken, "|"); }
706 - | APO2 { debugf ("textelementnotblpipe#5 "); $$ = newNodeS (TextToken, "''"); }
707 - | APO3 { debugf ("textelementnotblpipe#6 "); $$ = newNodeS (TextToken, "'''"); }
708 - | APO5 { debugf ("textelementnotblpipe#7 "); $$ = newNodeS (TextToken, "'''''"); }
709 - | EQUALS { debugf ("textelementnotblpipe#8 "); $$ = newNodeS (TextToken, addSpaces ("=", $1)); }
710 - | comment { debugf ("textelementnotblpipe#9 "); $$ = $1; }
711 - | linketcnotbl { debugf ("textelementnotblpipe#10 "); $$ = $1; }
712 - | italorboldnotblp{ debugf ("textelementnotblpipe#11 "); $$ = $1; }
 706+ | APO2 { debugf ("textelementnotblpipe#4 "); $$ = newNodeS (TextToken, "''"); }
 707+ | APO3 { debugf ("textelementnotblpipe#5 "); $$ = newNodeS (TextToken, "'''"); }
 708+ | APO5 { debugf ("textelementnotblpipe#6 "); $$ = newNodeS (TextToken, "'''''"); }
 709+ | EQUALS { debugf ("textelementnotblpipe#7 "); $$ = newNodeS (TextToken, addSpaces ("=", $1)); }
 710+ | comment { debugf ("textelementnotblpipe#8 "); $$ = $1; }
 711+ | linketcnotbl { debugf ("textelementnotblpipe#9 "); $$ = $1; }
 712+ | italorboldnotblp{ debugf ("textelementnotblpipe#10 "); $$ = $1; }
713713
714714 textelementnoittbpp : TEXT { debugf ("textelementnoittbpp#1 "); $$ = $1; }
715715 | EXTENSION { debugf ("textelementnoittbpp#2 "); $$ = $1; }
716716 | PIPE { debugf ("textelementnoittbpp#3 "); $$ = newNodeS (TextToken, "|"); }
717 - | comment { debugf ("textelementnoittbpp#5 "); $$ = $1; }
718 - | linketcnotbl { debugf ("textelementnoittbpp#6 "); $$ = $1; }
719 - | boldnoitaltblpp { debugf ("textelementnoittbpp#7 "); $$ = $1; }
 717+ | comment { debugf ("textelementnoittbpp#4 "); $$ = $1; }
 718+ | linketcnotbl { debugf ("textelementnoittbpp#5 "); $$ = $1; }
 719+ | boldnoitaltblpp { debugf ("textelementnoittbpp#6 "); $$ = $1; }
720720
721721 textelementnobltbpp : TEXT { debugf ("textelementnobltbpp#1 "); $$ = $1; }
722722 | EXTENSION { debugf ("textelementnobltbpp#2 "); $$ = $1; }
723723 | PIPE { debugf ("textelementnobltbpp#3 "); $$ = newNodeS (TextToken, "|"); }
724 - | comment { debugf ("textelementnobltbpp#5 "); $$ = $1; }
725 - | linketcnotbl { debugf ("textelementnobltbpp#6 "); $$ = $1; }
726 - | italnoboldtblpp { debugf ("textelementnobltbpp#7 "); $$ = $1; }
 724+ | comment { debugf ("textelementnobltbpp#4 "); $$ = $1; }
 725+ | linketcnotbl { debugf ("textelementnobltbpp#5 "); $$ = $1; }
 726+ | italnoboldtblpp { debugf ("textelementnobltbpp#6 "); $$ = $1; }
727727
728728 textelementnoblittbp: TEXT { debugf ("textelementnoblittbp#1 "); $$ = $1; }
729729 | EXTENSION { debugf ("textelementnoblittbp#2 "); $$ = $1; }
730730 | PIPE { debugf ("textelementnoblittbp#3 "); $$ = newNodeS (TextToken, "|"); }
731 - | comment { debugf ("textelementnoblittbp#5 "); $$ = $1; }
732 - | linketcnotbl { debugf ("textelementnoblittbp#6 "); $$ = $1; }
 731+ | comment { debugf ("textelementnoblittbp#4 "); $$ = $1; }
 732+ | linketcnotbl { debugf ("textelementnoblittbp#5 "); $$ = $1; }
733733
734 -zeroormorenewlines : /* empty */ { debugf ("zeroormorenewlines#1 "); $$ = 0; }
735 - | oneormorenewlines { debugf ("zeroormorenewlines#2 "); $$ = 0; }
736 -oneormorenewlines : NEWLINE { debugf ("oneormorenewlines#1 "); $$ = 0; }
737 - | oneormorenewlines NEWLINE { debugf ("oneormorenewlines#2 "); $$ = 0; }
 734+zeroormorenewlines : /* empty */ { debugf ("zeroormorenewlines#1 "); $$ = 0; }
 735+ | oneormorenewlines { debugf ("zeroormorenewlines#2 "); $$ = 0; }
 736+oneormorenewlines : NEWLINE { debugf ("oneormorenewlines#1 "); $$ = 0; }
 737+ | oneormorenewlines NEWLINE { debugf ("oneormorenewlines#2 "); $$ = 0; }
738738
739 -zeroormorenewlinessave : /* empty */ { debugf ("zeroormorenewlinessave#1 "); $$ = 0; }
740 - | oneormorenewlinessave { debugf ("zeroormorenewlinessave#2 "); $$ = $1; }
741 -oneormorenewlinessave : NEWLINE { debugf ("oneormorenewlinessave#1 "); $$ = newNodeI (Newlines, 0); }
742 - | oneormorenewlinessave NEWLINE { debugf ("oneormorenewlinessave#2 "); $1->data.num++; $$ = $1; }
 739+zeroormorenewlinessave : /* empty */ { debugf ("zeroormorenewlinessave#1 "); $$ = 0; }
 740+ | oneormorenewlinessave { debugf ("zeroormorenewlinessave#2 "); $$ = $1; }
 741+oneormorenewlinessave : NEWLINE { debugf ("oneormorenewlinessave#1 "); $$ = newNodeI (Newlines, 0); }
 742+ | oneormorenewlinessave NEWLINE { debugf ("oneormorenewlinessave#2 "); $1->data.num++; $$ = $1; }
743743
744744 paragraph : text NEWLINE
745745 { debugf ("paragraph#1 "); $$ = nodeAddChild (newNode (Paragraph), $1); }

Status & tagging log