From 8a73e4fab08e53763dcb74aa744ff4fbf192c2a0 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 30 Jan 2004 07:02:42 +0000 Subject: [PATCH] 2003/06/30 07:09:04 darcs-hash:20040130070242-0c9ea-61aba11f7b8f4386379e464150520d1d39118ee7.gz --- src/org/xwt/Box.java | 1 + src/org/xwt/js/Parser.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index f40a413..04bc0cc 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -1163,6 +1163,7 @@ public final class Box extends JS.Scope { public Object get(Object name_, boolean ignoretraps) { if (name_ instanceof Number) return get(((Number)name_).intValue()); + if (!(name_ instanceof String)) return null; String name = (String)name_; if (name.equals("")) return null; diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java index 10159b7..cc3128b 100644 --- a/src/org/xwt/js/Parser.java +++ b/src/org/xwt/js/Parser.java @@ -111,13 +111,13 @@ class Parser extends Lexer implements ByteCodes { precedence[ASSIGN_MOD] = 1; precedence[HOOK] = 2; precedence[COMMA] = 3; - precedence[OR] = precedence[AND] = 4; + precedence[OR] = precedence[AND] = precedence[BANG] = 4; precedence[GT] = precedence[GE] = 5; precedence[BITOR] = 6; precedence[BITXOR] = 7; precedence[BITAND] = 8; precedence[EQ] = precedence[NE] = 9; - precedence[LT] = precedence[LE] = 10; + precedence[LT] = precedence[LE] = precedence[TYPEOF] = 10; precedence[SHEQ] = precedence[SHNE] = 11; precedence[LSH] = precedence[RSH] = precedence[URSH] = 12; precedence[ADD] = precedence[SUB] = 13; -- 1.7.10.4