found more problems in the grammars; fixed them

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@1041 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · May 20, 2011 · 7e31bd0 · 7e31bd0
1 parent 5b63ad8
commit 7e31bd0
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 14 deletions.
diff --git a/topics/grammars/ada/kempe/post-extract.xbgf b/topics/grammars/ada/kempe/post-extract.xbgf
@@ -27,6 +27,18 @@
 			<nonterminal>underline</nonterminal>
 		</bgf:expression>
 	</xbgf:replace>
+	<!-- Resolving the confusion of "pragma" and the pragma nonterminal -->
+	<xbgf:replace>
+		<bgf:expression>
+			<nonterminal>pragma</nonterminal>
+		</bgf:expression>
+		<bgf:expression>
+			<terminal>pragma</terminal>
+		</bgf:expression>
+		<in>
+			<nonterminal>pragma</nonterminal>
+		</in>
+	</xbgf:replace>
 	<!-- Disambiguating "range" and the range nonterminal -->
 	<xbgf:replace>
 		<bgf:expression>

diff --git a/topics/grammars/ada/laemmel-verhoef/correct.xbgf b/topics/grammars/ada/laemmel-verhoef/correct.xbgf
@@ -12,4 +12,16 @@
 			<nonterminal>unary_adding_operator</nonterminal>
 		</in>
 	</xbgf:replace>
+	<!-- This one was added by Vadim Zaytsev, vadim@grammarware.net -->
+	<xbgf:replace>
+		<bgf:expression>
+			<nonterminal>pragma</nonterminal>
+		</bgf:expression>
+		<bgf:expression>
+			<terminal>pragma</terminal>
+		</bgf:expression>
+		<in>
+			<nonterminal>pragma</nonterminal>
+		</in>
+	</xbgf:replace>
 </xbgf:sequence>
diff --git a/topics/grammars/cpp/iso-n2723/Makefile b/topics/grammars/cpp/iso-n2723/Makefile
@@ -3,6 +3,7 @@ tooldir = ../../../../shared/tools
 build:
 	grep -xv 'c ' iso-is-annex.txt > iso-is-annex-no-c.txt
 	perl -pi -w -e 's/hand ler/handler/g;' iso-is-annex-no-c.txt
+	perl -pi -w -e 's/∼/~/g;' iso-is-annex-no-c.txt
 	${tooldir}/pdf2bgf iso-is-annex-no-c.txt iso-output.bgf banned-lines.lst keywords.lst
 	${tooldir}/checkxml bgf iso-output.bgf
 	${tooldir}/normbgf iso-output.bgf iso-is-grammar.bgf

diff --git a/topics/grammars/cpp/iso-n2723/correct.xbgf b/topics/grammars/cpp/iso-n2723/correct.xbgf
@@ -108,7 +108,7 @@
 								<terminal>::</terminal>
 							</bgf:expression>
 							<bgf:expression>
-								<terminal>∼</terminal>
+								<terminal>~</terminal>
 							</bgf:expression>
 							<bgf:expression>
 								<nonterminal>type-name</nonterminal>
@@ -137,7 +137,7 @@
 								<terminal>::</terminal>
 							</bgf:expression>
 							<bgf:expression>
-								<terminal>∼</terminal>
+								<terminal>~</terminal>
 							</bgf:expression>
 							<bgf:expression>
 								<nonterminal>type-name</nonterminal>
@@ -161,7 +161,7 @@
 								</optional>
 							</bgf:expression>
 							<bgf:expression>
-								<terminal>∼</terminal>
+								<terminal>~</terminal>
 							</bgf:expression>
 							<bgf:expression>
 								<nonterminal>type-name</nonterminal>

diff --git a/topics/grammars/cpp/iso-n2723/extracted-grammar.bgf b/topics/grammars/cpp/iso-n2723/extracted-grammar.bgf
@@ -71,7 +71,7 @@
 				<bgf:expression>
 					<sequence>
 						<bgf:expression>
-							<terminal>∼</terminal>
+							<terminal>~</terminal>
 						</bgf:expression>
 						<bgf:expression>
 							<nonterminal>class-name</nonterminal>
@@ -846,7 +846,7 @@
 				<bgf:expression>
 					<sequence>
 						<bgf:expression>
-							<terminal>∼</terminal>
+							<terminal>~</terminal>
 						</bgf:expression>
 						<bgf:expression>
 							<nonterminal>type-name</nonterminal>
@@ -983,7 +983,7 @@
 					<terminal>!</terminal>
 				</bgf:expression>
 				<bgf:expression>
-					<terminal>∼</terminal>
+					<terminal>~</terminal>
 				</bgf:expression>
 			</choice>
 		</bgf:expression>
@@ -4802,7 +4802,7 @@
 					<terminal>|</terminal>
 				</bgf:expression>
 				<bgf:expression>
-					<terminal>∼</terminal>
+					<terminal>~</terminal>
 				</bgf:expression>
 				<bgf:expression>
 					<terminal>!</terminal>

diff --git a/topics/grammars/cpp/iso-n2723/keywords.lst b/topics/grammars/cpp/iso-n2723/keywords.lst
@@ -2,7 +2,7 @@
 <: :> <% %> %: %:%: ; : ... 
 new delete ? :: . .* 
 + - * / % ^ & | 
-∼ 
+~ 
 ! = < > += -= *= /= %= 
 ^= &= |= << >> >>= <<= == != 
 <= >= && || ++ -- , ->* -> 

diff --git a/topics/grammars/cpp/iso-n2723/recovered-grammar.bgf b/topics/grammars/cpp/iso-n2723/recovered-grammar.bgf
@@ -1620,7 +1620,7 @@
 				<bgf:expression>
 					<sequence>
 						<bgf:expression>
-							<terminal>∼</terminal>
+							<terminal>~</terminal>
 						</bgf:expression>
 						<bgf:expression>
 							<nonterminal>class-name</nonterminal>
@@ -1707,7 +1707,7 @@
 					<terminal>|</terminal>
 				</bgf:expression>
 				<bgf:expression>
-					<terminal>∼</terminal>
+					<terminal>~</terminal>
 				</bgf:expression>
 				<bgf:expression>
 					<terminal>!</terminal>
@@ -3419,7 +3419,7 @@
 							<terminal>::</terminal>
 						</bgf:expression>
 						<bgf:expression>
-							<terminal>∼</terminal>
+							<terminal>~</terminal>
 						</bgf:expression>
 						<bgf:expression>
 							<nonterminal>type-name</nonterminal>
@@ -3448,7 +3448,7 @@
 							<terminal>::</terminal>
 						</bgf:expression>
 						<bgf:expression>
-							<terminal>∼</terminal>
+							<terminal>~</terminal>
 						</bgf:expression>
 						<bgf:expression>
 							<nonterminal>type-name</nonterminal>
@@ -3472,7 +3472,7 @@
 							</optional>
 						</bgf:expression>
 						<bgf:expression>
-							<terminal>∼</terminal>
+							<terminal>~</terminal>
 						</bgf:expression>
 						<bgf:expression>
 							<nonterminal>type-name</nonterminal>
@@ -3502,7 +3502,7 @@
 					<terminal>!</terminal>
 				</bgf:expression>
 				<bgf:expression>
-					<terminal>∼</terminal>
+					<terminal>~</terminal>
 				</bgf:expression>
 			</choice>
 		</bgf:expression>