rhino

[Dhek Bhun Kho <bhun@chello.nl>]

[-- Attachment #1: Type: text/plain, Size: 962 bytes --]

I was running a toplevel make using GCJ 3.2.1:

d `org.mozilla.javascript.LineBuffer.skipFormatChar()':
../../../rhug/rhino/upstream/src/org/mozilla/javascript/LineBuffer.java:455: Incompatible type for `&&'. Can't convert `int' to boolean.
       private static final boolean checkSelf = Context.check && true;
                                                              ^
../../../rhug/rhino/upstream/src/org/mozilla/javascript/LineBuffer.java:455: Incompatible type for `&&'. Can't convert `int' to boolean.
       private static final boolean checkSelf = Context.check && true;
                                                              ^
2 errors

Attached a diff to fix it, the Context.check is defined as a final
static boolean = true, so I hacked in (Context.check==true) which is
correct to do as Context.check should be true at all times, it is
unlikely that they will change this as they happily note that it is a
Design by contract requirement.

[-- Attachment #2: LineBuffer.diff --]
[-- Type: text/plain, Size: 460 bytes --]

--- /home/cvs/LineBuffer.java	2003-01-05 00:58:47.000000000 +0100
+++ ../../rhug/rhino/upstream/src/org/mozilla/javascript/LineBuffer.java	2003-01-05 00:56:17.000000000 +0100
@@ -452,5 +452,5 @@
     private boolean hadCFSinceStringStart = false;
 
 // Rudimentary support for Design-by-Contract
-    private static final boolean checkSelf = Context.check && true;
+    private static final boolean checkSelf = (Context.check==true) && true;
 }