Changeset 12 for trunk/spec

Timestamp:

05/22/08 14:14:40 (7 months ago)

Author:

oren

Message:

Fix bug in naming of production link;
Enhance verifiers to catch this sort of problem.

Location:

trunk/spec

Files:

• spec.dbk (modified) (2 diffs)
• verify_terms.pl (modified) (3 diffs)

trunk/spec/spec.dbk

@@ -9665 +9665 @@
                 <nonterminal
                   def="#c-mapping-value"><quote>:</quote></nonterminal>
-                ( <nonterminal def="#s-l+block-indented(n,c)"
+                ( <nonterminal def="#s-l+block-node(n,c)"
                   >s-l+block-node(n,block-out)</nonterminal><sbr/>
                 &nbsp;&nbsp;&nbsp;&nbsp;| <nonterminal def="#e-node"/>
@@ -10186 +10186 @@
             <rhs>
               <nonterminal def="#s-l+block-node(n,c)"
-                >ns-l+block-node(-1,block-in)</nonterminal><sbr/>
+                >s-l+block-node(-1,block-in)</nonterminal><sbr/>
               /* Excluding <nonterminal def="#c-forbidden"/> content */
             </rhs>

trunk/spec/verify_terms.pl

@@ -21 +21 @@
 }
 
+my $in_non_term = 0;
+
 sub StartTag {
   my $tag = $_;
   my $attr = \%_;
+
+  if ($tag =~ /<nonterminal def="#(.[^("]*)/) {
+    $in_non_term = $1;
+    $in_non_term =~ s/\+/\\+/g;
+    $in_non_term = 0 if $in_non_term eq 'c-reserved';
+  }
 
   if ($tag =~ /^<sect|^<chapter|^<book>/) {
@@ -62 +70 @@
 
 sub Text {
+  my $text = $_;
+  warn("PRD-REF $text => $in_non_term") if $in_non_term and $text !~ /^.$|^${in_non_term}/;
   if ($keep_next_text) {
-    my $text = $_;
     $text =~ s/(?:\s|\n)+/ /g;
     push(@parts_stack, $text);
@@ -73 +82 @@
   my $tag = $_;
   my $attr = \%_;
+  $in_non_term = 0 if ($tag =~ /nonterminal/);
+
   pop(@parts_stack) if ($tag =~ /sect|chapter|book/);
 }