summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-20 20:56:55 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-20 20:56:55 +0000
commit63b82f0a74f7ec778b00401a1a273c9df747b758 (patch)
tree6acf5a395de87f11c9e74e2fe2d5f4abe36f4e61
parent2a0a68e040099cb3be5b67d3155097d39d0197e3 (diff)
downloadgcc-63b82f0a74f7ec778b00401a1a273c9df747b758.tar.gz
2010-01-20 Basile Starynkevitch <basile@starynkevitch.net>
{{tmatch-6 is translated but runs incorrectly.}} * melt/warmelt-normatch.melt: normpat_orpat.subdisjhandler append to testlist. * melt/warmelt-genobj.melt: compiltst_normtester_orclear uses the gotothen.. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@156083 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.MELT7
-rw-r--r--gcc/melt/warmelt-genobj.melt8
-rw-r--r--gcc/melt/warmelt-normatch.melt3
3 files changed, 13 insertions, 5 deletions
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index c8204954ceb..617d2703f02 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,3 +1,10 @@
+2010-01-20 Basile Starynkevitch <basile@starynkevitch.net>
+ {{tmatch-6 is translated but runs incorrectly.}}
+ * melt/warmelt-normatch.melt: normpat_orpat.subdisjhandler append
+ to testlist.
+ * melt/warmelt-genobj.melt: compiltst_normtester_orclear uses the
+ gotothen..
+
2010-01-19 Basile Starynkevitch <basile@starynkevitch.net>
{{tmatch-6 still fails to be translated.}}
* melt/warmelt-normatch.melt:simpler subdisjhandler in
diff --git a/gcc/melt/warmelt-genobj.melt b/gcc/melt/warmelt-genobj.melt
index 79c83027cfc..016df0c7ed7 100644
--- a/gcc/melt/warmelt-genobj.melt
+++ b/gcc/melt/warmelt-genobj.melt
@@ -5495,10 +5495,10 @@ $SBUF.}#
(nelse (unsafe_get_field :ntest_else ntoc))
(nclear (unsafe_get_field :ntorclear_locsym ntoc))
(olist (make_list discr_list))
-;;; (gotothen (or (normtester_gotoinstr nthen gcx)
-;;; (endmatch_gotoinstr normatch gcx nloc)))
- (gotoelse (or (normtester_gotoinstr nelse gcx)
+ (gotothen (or (normtester_gotoinstr nthen gcx)
(endmatch_gotoinstr normatch gcx nloc)))
+;;; (gotoelse (or (normtester_gotoinstr nelse gcx)
+;;; (endmatch_gotoinstr normatch gcx nloc)))
)
(debug_msg nclear "compiltst_normtester_orclear nclear")
(debug_msg nthen "compiltst_normtester_orclear nthen")
@@ -5520,7 +5520,7 @@ $SBUF.}#
(list_append olist oclrloc)
)
)
- (list_append olist gotoelse)
+ (list_append olist gotothen)
(debug_msg olist "compiltst_normtester_orclear final olist")
(compile_warning "perhaps unimplemented compiltst_normtester_orclear")
(return olist)
diff --git a/gcc/melt/warmelt-normatch.melt b/gcc/melt/warmelt-normatch.melt
index 05e66e5a325..b9e964ec00d 100644
--- a/gcc/melt/warmelt-normatch.melt
+++ b/gcc/melt/warmelt-normatch.melt
@@ -591,7 +591,7 @@
(debug_msg partester "set_new_tester_all_elses partester")
(shortbacktrace_dbg "set_new_tester_all_elses start" 15)
(assert_msg "check newtester" (is_a newtester class_normtester_any))
- (assert_msg "check partester" (is_a partester class_normtester_anytester))
+ (assert_msg "check partester" (is_a partester class_normtester_any))
(if (null updatlist)
(setq updatlist (make_list discr_list)))
(assert_msg "check updatlist" (is_list updatlist))
@@ -1302,6 +1302,7 @@
(progn
(debug_msg prevtest "normpat_orpat.subdisjhandler setelse of prevtest")
(debug_msg norclear "normpat_orpat.subdisjhandler setelse to norclear")
+ (list_append testlist norclear)
(set_new_tester_all_elses prevtest norclear)
))
)