Changes in directory llvm/utils/TableGen:
FileParser.cpp.cvs updated: 1.5 -> 1.6
FileParser.y updated: 1.44 -> 1.45
FileParser.y.cvs updated: 1.5 -> 1.6
---
Log message:
Make sure to clear CurDefmPrefix = 0, otherwise stuff after a defm won't
parse right. This fixes TableGen/MultiClass.td
---
Diffs of the changes: (+15 -12)
FileParser.cpp.cvs | 25 +++++++++++++------------
FileParser.y | 1 +
FileParser.y.cvs | 1 +
3 files changed, 15 insertions(+), 12 deletions(-)
Index: llvm/utils/TableGen/FileParser.cpp.cvs
diff -u llvm/utils/TableGen/FileParser.cpp.cvs:1.5
llvm/utils/TableGen/FileParser.cpp.cvs:1.6
--- llvm/utils/TableGen/FileParser.cpp.cvs:1.5 Fri Sep 1 16:59:03 2006
+++ llvm/utils/TableGen/FileParser.cpp.cvs Fri Sep 1 17:07:27 2006
@@ -351,9 +351,9 @@
523, 525, 531, 531, 532, 532, 534, 536, 540, 545,
550, 553, 557, 560, 565, 566, 566, 568, 568, 570,
577, 595, 620, 634, 639, 641, 643, 647, 657, 671,
- 674, 678, 689, 691, 693, 698, 698, 763, 763, 764,
- 764, 766, 771, 771, 774, 774, 777, 780, 784, 784,
- 786
+ 674, 678, 689, 691, 693, 698, 698, 764, 764, 765,
+ 765, 767, 772, 772, 775, 775, 778, 781, 785, 785,
+ 787
};
#endif
@@ -1813,45 +1813,46 @@
delete &TemplateVals;
delete yyvsp[-4].StrVal;
+ CurDefmPrefix = 0;
;
break;}
case 88:
-#line 763 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 764 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{;
break;}
case 89:
-#line 763 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 764 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{;
break;}
case 92:
-#line 766 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 767 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{
LetStack.back().push_back(LetRecord(*yyvsp[-3].StrVal, yyvsp[-2].BitList,
yyvsp[0].Initializer));
delete yyvsp[-3].StrVal; delete yyvsp[-2].BitList;
;
break;}
case 95:
-#line 774 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 775 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{ LetStack.push_back(std::vector<LetRecord>()); ;
break;}
case 97:
-#line 777 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 778 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{
LetStack.pop_back();
;
break;}
case 98:
-#line 780 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 781 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{
LetStack.pop_back();
;
break;}
case 99:
-#line 784 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 785 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{;
break;}
case 100:
-#line 784 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 785 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
{;
break;}
}
@@ -2076,7 +2077,7 @@
}
return 1;
}
-#line 788 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
+#line 789 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y"
int yyerror(const char *ErrorMsg) {
Index: llvm/utils/TableGen/FileParser.y
diff -u llvm/utils/TableGen/FileParser.y:1.44
llvm/utils/TableGen/FileParser.y:1.45
--- llvm/utils/TableGen/FileParser.y:1.44 Fri Sep 1 16:59:03 2006
+++ llvm/utils/TableGen/FileParser.y Fri Sep 1 17:07:27 2006
@@ -758,6 +758,7 @@
delete &TemplateVals;
delete $2;
+ CurDefmPrefix = 0;
};
Object : ClassInst {} | DefInst {};
Index: llvm/utils/TableGen/FileParser.y.cvs
diff -u llvm/utils/TableGen/FileParser.y.cvs:1.5
llvm/utils/TableGen/FileParser.y.cvs:1.6
--- llvm/utils/TableGen/FileParser.y.cvs:1.5 Fri Sep 1 16:59:03 2006
+++ llvm/utils/TableGen/FileParser.y.cvs Fri Sep 1 17:07:27 2006
@@ -758,6 +758,7 @@
delete &TemplateVals;
delete $2;
+ CurDefmPrefix = 0;
};
Object : ClassInst {} | DefInst {};
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
