[kaffe] CVS kaffe-extras (guilhem): Fix for KJC.
Kaffe CVS
cvs-commits at kaffe.org
Wed Jul 21 07:27:36 PDT 2004
PatchSet 40
Date: 2004/07/21 08:31:05
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fix for KJC.
* kjc/Main.java: Moved up checkModifiers to ensure modifiers has been
updated for the join pass.
Members:
patches/kjc-kaffe.diff:1.7->1.8
Index: kaffe-extras/patches/kjc-kaffe.diff
diff -u kaffe-extras/patches/kjc-kaffe.diff:1.7 kaffe-extras/patches/kjc-kaffe.diff:1.8
--- kaffe-extras/patches/kjc-kaffe.diff:1.7 Mon Jul 19 17:03:29 2004
+++ kaffe-extras/patches/kjc-kaffe.diff Wed Jul 21 08:31:05 2004
@@ -1,7 +1,12 @@
diff -N ChangeLog
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ ChangeLog 19 Jul 2004 16:55:40 -0000 1.7
-@@ -0,0 +1,58 @@
++++ ChangeLog 21 Jul 2004 08:19:22 -0000 1.8
+@@ -0,0 +1,63 @@
++2004-07-21 Guilhem Lavaux <guilhem at kaffe.org>
++
++ * kjc/Main.java: Moved up checkModifiers to ensure modifiers has been
++ updated for the join pass.
++
+2004-07-19 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * compiler/base/CompilerMessages.java,
@@ -868,7 +873,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm;
@@ -979,7 +984,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+// Import the necessary classes
@@ -2452,7 +2457,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm;
@@ -4672,7 +4677,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm
@@ -4824,7 +4829,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+prefix Ksm
@@ -8070,7 +8075,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm;
@@ -8157,7 +8162,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm;
@@ -8349,7 +8354,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm;
@@ -8458,7 +8463,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+package at.dms.ksm;
@@ -8524,7 +8529,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
+
+aaload ......... :
@@ -31516,7 +31521,7 @@
+/*
+ * Based on skeleton.default from JFlex 1.4
+ *
-+ * $Id: kjc-kaffe.diff,v 1.7 2004/07/19 17:03:29 guilhem Exp $
++ * $Id: kjc-kaffe.diff,v 1.8 2004/07/21 08:31:05 guilhem Exp $
+ */
/** This character denotes the end of file */
@@ -38521,9 +38526,9 @@
}
public void genLoad(GenerationContext context) {
-diff -u -r1.1.1.1 -r1.5
+diff -u -r1.1.1.1 -r1.6
--- kjc/Main.java 6 Apr 2004 16:59:24 -0000 1.1.1.1
-+++ kjc/Main.java 19 Jul 2004 16:55:41 -0000 1.5
++++ kjc/Main.java 21 Jul 2004 08:19:23 -0000 1.6
@@ -25,6 +25,7 @@
import java.io.UnsupportedEncodingException;
import java.io.PrintWriter;
@@ -38588,25 +38593,34 @@
}
infiles = null;
-@@ -159,26 +163,41 @@
+@@ -153,32 +157,47 @@
+ long lastTime = System.currentTimeMillis();
+
+ for (int count = 0; count < tree.length; count++) {
+- join(tree[count]);
++ checkModifiers(tree[count]);
++ }
++ if (verboseMode()) {
++ inform(CompilerMessages.MODIFIERS_CHECKED, new Long(System.currentTimeMillis() - lastTime));
+ }
+-
if (errorFound) {
return false;
}
--
-+
+
for (int count = 0; count < tree.length; count++) {
- checkInterface(tree[count]);
-+ checkModifiers(tree[count]);
- }
- if (verboseMode()) {
+- }
+- if (verboseMode()) {
- inform(CompilerMessages.INTERFACES_CHECKED, new Long(System.currentTimeMillis() - lastTime));
-+ inform(CompilerMessages.MODIFIERS_CHECKED, new Long(System.currentTimeMillis() - lastTime));
++ join(tree[count]);
}
--
+
if (errorFound) {
return false;
}
-
+-
++
for (int count = 0; count < tree.length; count++) {
- checkInitializers(tree[count]);
+ checkInterface(tree[count]);
More information about the kaffe
mailing list