[llvm-commits] CVS: llvm/utils/Burg/be.c fe.h main.c plank.c

[Chris Lattner]

Changes in directory llvm/utils/Burg:

be.c updated: 1.2 -> 1.3
fe.h updated: 1.2 -> 1.3
main.c updated: 1.1 -> 1.2
plank.c updated: 1.2 -> 1.3

---
Log message:

Fix warnings


---
Diffs of the changes:

Index: llvm/utils/Burg/be.c
diff -u llvm/utils/Burg/be.c:1.2 llvm/utils/Burg/be.c:1.3
--- llvm/utils/Burg/be.c:1.2	Sat Sep 21 21:40:40 2002
+++ llvm/utils/Burg/be.c	Mon Jan 20 00:19:18 2003
@@ -1,4 +1,4 @@
-char rcsid_be[] = "$Id: be.c,v 1.2 2002/09/22 02:40:40 lattner Exp $";
+char rcsid_be[] = "$Id: be.c,v 1.3 2003/01/20 06:19:18 lattner Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -688,14 +688,14 @@
 		fprintf(outfile, "\t");
 		if (pVector[i]) {
 			Operator o;
-			NonTerminal t;
+			NonTerminal t1, t2;
 
 			fprintf(outfile, "{");
 			fprintf(outfile, "%5d, %5d, %5d, %5d",
 				pVector[i]->rule->lhs->num,
 				(o = pVector[i]->rule->pat->op) ? o->num : 0,
-				(t = pVector[i]->rule->pat->children[0]) ? t->num : 0,
-				(t = pVector[i]->rule->pat->children[1]) ? t->num : 0
+				(t1 = pVector[i]->rule->pat->children[0]) ? t1->num : 0,
+				(t2 = pVector[i]->rule->pat->children[1]) ? t2->num : 0
 				);
 			fprintf(outfile, "} /* ");
 			printRule(pVector[i], "0");


Index: llvm/utils/Burg/fe.h
diff -u llvm/utils/Burg/fe.h:1.2 llvm/utils/Burg/fe.h:1.3
--- llvm/utils/Burg/fe.h:1.2	Sat Sep 21 21:40:40 2002
+++ llvm/utils/Burg/fe.h	Mon Jan 20 00:19:18 2003
@@ -1,4 +1,4 @@
-/* $Id: fe.h,v 1.2 2002/09/22 02:40:40 lattner Exp $ */
+/* $Id: fe.h,v 1.3 2003/01/20 06:19:18 lattner Exp $ */
 
 struct binding {
 	char	*name;
@@ -57,6 +57,11 @@
 	List elems;
 };
 typedef struct strTable	*StrTable;
+
+extern void doGrammarNts ARGS((void));
+void makeRuleDescArray ARGS((void));
+void makeDeltaCostArray ARGS((void));
+void makeStateStringArray ARGS((void));
 
 extern StrTable newStrTable ARGS((void));
 extern StrTableElement addString ARGS((StrTable, char *, int, int *));


Index: llvm/utils/Burg/main.c
diff -u llvm/utils/Burg/main.c:1.1 llvm/utils/Burg/main.c:1.2
--- llvm/utils/Burg/main.c:1.1	Tue Sep 17 18:03:29 2002
+++ llvm/utils/Burg/main.c	Mon Jan 20 00:19:18 2003
@@ -1,4 +1,4 @@
-char rcsid_main[] = "$Id: main.c,v 1.1 2002/09/17 23:03:29 lattner Exp $";
+char rcsid_main[] = "$Id: main.c,v 1.2 2003/01/20 06:19:18 lattner Exp $";
 
 #include <math.h>
 #include <stdio.h>
@@ -15,9 +15,9 @@
 
 static char version[] = "BURG, Version 1.0";
 
-extern void main ARGS((int argc, char **argv));
+extern int main ARGS((int argc, char **argv));
 
-void
+int
 main(argc, argv) int argc; char **argv;
 {
 	int i;
@@ -33,7 +33,7 @@
 				fprintf(stderr, "%s\n", version);
 				break;
 			case 'p':
-				needStr = &prefix;
+				needStr = (char**)&prefix;
 				break;
 			case 'o':
 				needStr = &outFileName;


Index: llvm/utils/Burg/plank.c
diff -u llvm/utils/Burg/plank.c:1.2 llvm/utils/Burg/plank.c:1.3
--- llvm/utils/Burg/plank.c:1.2	Sat Sep 21 21:40:40 2002
+++ llvm/utils/Burg/plank.c	Mon Jan 20 00:19:18 2003
@@ -1,4 +1,4 @@
-char rcsid_plank[] = "$Id: plank.c,v 1.2 2002/09/22 02:40:40 lattner Exp $";
+char rcsid_plank[] = "$Id: plank.c,v 1.3 2003/01/20 06:19:18 lattner Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -232,7 +232,7 @@
 	for (i = 1; i < globalMap->count; i++) {
 		sortedStates[i-1] = globalMap->set[i];
 	}
-	qsort(sortedStates, globalMap->count-1, sizeof(Item_Set), stateCompare);
+	qsort(sortedStates, globalMap->count-1, sizeof(Item_Set), (int(*)(const void *, const void *))stateCompare);
 	previousOp = 0;
 	for (i = 0; i < globalMap->count-1; i++) {
 		sortedStates[i]->newNum = i;
@@ -246,7 +246,7 @@
 	sortedRules = (RuleAST*) zalloc(max_ruleAST * sizeof(RuleAST));
 	count = 0;
 	foreachList((ListFn) assignRules, ruleASTs);
-	qsort(sortedRules, max_ruleAST, sizeof(RuleAST), ruleCompare);
+	qsort(sortedRules, max_ruleAST, sizeof(RuleAST), (int(*)(const void *, const void *))ruleCompare);
 	previousLHS = 0;
 	base_counter = 0;
 	for (i = 0; i < max_ruleAST; i++) {