mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Switch to new JSValue hierarchy. 

Added logical/bitwise ops.
This commit is contained in:
rogerl%netscape.com 1999-05-20 00:13:38 +00:00
Родитель 1fa0abf6f3
Коммит 078bf5d87b
5 изменённых файлов: 41 добавлений и 61 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
js/js2/java/ArithmeticNode.java
Просмотреть файл

@ -15,6 +15,15 @@ class ArithmeticNode extends BinaryNode {
else
if (op == "-")
theEnv.theStack.push(new StackValue(dL - dR));
else
if (op == "*")
theEnv.theStack.push(new StackValue(dL * dR));
else
if (op == "/")
theEnv.theStack.push(new StackValue(dL / dR));
else
if (op == "%")
theEnv.theStack.push(new StackValue(dL % dR));
else
System.out.println("missing arithmetic op " + op);
}

2
js/js2/java/ControlNodeGroup.java
Просмотреть файл

@ -127,7 +127,7 @@ class ControlNodeGroup {
{
ControlNode c = (ControlNode)(breakTails.elementAt(i));
ExpressionNode e = c.getExpression();
String tgt = (e == null) ? null : ((JSValue)e).value;
String tgt = (e == null) ? null : ((JSObject)e).value;
if ((tgt == null) || tgt.equals(label)) {
tails.addElement(c);
breakTails.removeElementAt(i);

50
js/js2/java/JSGrammar.g
Просмотреть файл

@ -45,14 +45,14 @@ options {
// ********* Identifiers **********
identifier returns [ExpressionNode e]
{ e = null; }
: opI:IDENT { e = new JSValue("object", opI.getText()); }
| "version" { e = new JSValue("object", "version"); }
| "override" { e = new JSValue("object", "override"); }
| "method" { e = new JSValue("object", "method"); }
| "getter" { e = new JSValue("object", "getter"); }
| "setter" { e = new JSValue("object", "setter"); }
| "traditional" { e = new JSValue("object", "traditional"); }
| "constructor" { e = new JSValue("object", "constructor"); }
: opI:IDENT { e = new JSObject("object", opI.getText()); }
| "version" { e = new JSObject("object", "version"); }
| "override" { e = new JSObject("object", "override"); }
| "method" { e = new JSObject("object", "method"); }
| "getter" { e = new JSObject("object", "getter"); }
| "setter" { e = new JSObject("object", "setter"); }
| "traditional" { e = new JSObject("object", "traditional"); }
| "constructor" { e = new JSObject("object", "constructor"); }
;
qualified_identifier returns [ExpressionNode e]
@ -79,15 +79,15 @@ primary_expression[boolean initial] returns [ExpressionNode e]
simple_expression returns [ExpressionNode e]
{ e = null; }
: "null" { e = new JSValue("object", "null"); }
| "true" { e = new JSValue("boolean", "true"); }
| "false" { e = new JSValue("boolean", "false"); }
| opN:NUMBER { e = new JSValue("number", opN.getText()); }
| opS:STRING { e = new JSValue("number", opS.getText()); }
| "this" { e = new JSValue("object", "this"); }
| "super" { e = new JSValue("object", "super"); }
: "null" { e = new JSObject("object", "null"); }
| "true" { e = new JSBoolean("true"); }
| "false" { e = new JSBoolean("false"); }
| opN:NUMBER { e = new JSDouble(opN.getText()); }
| opS:STRING { e = new JSString(opS.getText()); }
| "this" { e = new JSObject("object", "this"); }
| "super" { e = new JSObject("object", "super"); }
| e = qualified_identifier_or_parenthesized_expression
| opR:REGEXP { e = new JSValue("regexp", opR.getText()); }
| opR:REGEXP { e = new JSObject("regexp", opR.getText()); }
| e = array_literal
;
@ -227,9 +227,9 @@ additive_expression[boolean initial] returns [ExpressionNode e]
shift_expression[boolean initial] returns [ExpressionNode e]
{ e = null; ExpressionNode r = null; }
: e = additive_expression[initial] (
("<<" r = additive_expression[false] { e = new ArithmeticNode("<<", e, r); } )
| (">>" r = additive_expression[false] { e = new ArithmeticNode(">>", e, r); } )
| (">>>" r = additive_expression[false] { e = new ArithmeticNode(">>>", e, r); } )
("<<" r = additive_expression[false] { e = new BitwiseNode("<<", e, r); } )
| (">>" r = additive_expression[false] { e = new BitwiseNode(">>", e, r); } )
| (">>>" r = additive_expression[false] { e = new BitwiseNode(">>>", e, r); } )
)*
;
@ -273,32 +273,32 @@ equality_expression[boolean initial, boolean allowIn] returns [ExpressionNode e]
bitwise_and_expression[boolean initial, boolean allowIn] returns [ExpressionNode e]
{ e = null; ExpressionNode r = null; }
: e = equality_expression[initial, allowIn]
("&" r = equality_expression[false, allowIn] { e = new ArithmeticNode("&", e, r); } )*
("&" r = equality_expression[false, allowIn] { e = new BitwiseNode("&", e, r); } )*
;
bitwise_xor_expression[boolean initial, boolean allowIn] returns [ExpressionNode e]
{ e = null; ExpressionNode r = null; }
: e = bitwise_and_expression[initial, allowIn]
("^" (r = bitwise_and_expression[false, allowIn] { e = new BinaryNode("^", e, r); } | "*" | "?"))*
("^" (r = bitwise_and_expression[false, allowIn] { e = new BitwiseNode("^", e, r); } | "*" | "?"))*
;
bitwise_or_expression[boolean initial, boolean allowIn] returns [ExpressionNode e]
{ e = null; ExpressionNode r = null; }
: e = bitwise_xor_expression[initial, allowIn]
("|" (r = bitwise_xor_expression[false, allowIn] { e = new BinaryNode("|", e, r); } | "*" | "?"))*
("|" (r = bitwise_xor_expression[false, allowIn] { e = new BitwiseNode("|", e, r); } | "*" | "?"))*
;
// ********* Binary Logical Operators **********
logical_and_expression[boolean initial, boolean allowIn] returns [ExpressionNode e]
{ e = null; ExpressionNode r = null; }
: e = bitwise_or_expression[initial, allowIn]
("&&" r = bitwise_or_expression[false, allowIn] { e = new BinaryNode("&&", e, r); } )*
("&&" r = bitwise_or_expression[false, allowIn] { e = new LogicalNode("&&", e, r); } )*
;
logical_or_expression[boolean initial, boolean allowIn] returns [ExpressionNode e]
{ e = null; ExpressionNode r = null; }
: e = logical_and_expression[initial, allowIn]
("||" r = logical_and_expression[false, allowIn] { e = new BinaryNode("||", e, r); } )*
("||" r = logical_and_expression[false, allowIn] { e = new LogicalNode("||", e, r); } )*
;
// ********* Conditional Operators **********
@ -454,7 +454,7 @@ statements[int scope, ControlNodeGroup container]
// ********* Labeled Statements **********
labeled_statement[boolean non_empty, ControlNodeGroup container]
{ ExpressionNode e = null; }
: e = identifier ":" code_statement[non_empty, container, ((JSValue)e).value]
: e = identifier ":" code_statement[non_empty, container, ((JSObject)e).value]
;
if_statement[boolean non_empty, ControlNodeGroup container]

39
js/js2/java/JSValue.java
Просмотреть файл

@ -1,48 +1,19 @@
class JSValue extends ExpressionNode {
JSValue(String aType, String aValue)
{
type = aType;
value = aValue;
}
String print(String indent)
{
return indent + "JSValue " + type + " : " + value + "\n";
return indent + "JSValue\n";
}
void evalLHS(Environment theEnv)
{
if (type == "object") {
// if (!theEnv.theGlobals.containsKey(value))
// theEnv.theGlobals.put(value, new Double(0.0));
theEnv.theStack.push(new StackValue(value));
}
else {
System.out.println("EvalLHS on non-object");
}
throw new RuntimeException("EvalLHS on non-lvalue");
}
void eval(Environment theEnv)
{
if (type == "object") {
Double d = (Double)(theEnv.theGlobals.get(value));
if (d == null) {
System.out.println("Accessed undefined : " + value);
theEnv.theStack.push(new StackValue(0.0));
}
else
theEnv.theStack.push(new StackValue(d.doubleValue()));
}
else {
if (type == "number") {
Double d = new Double(value);
theEnv.theStack.push(new StackValue(d.doubleValue()));
}
}
}
String type;
String value;
throw new RuntimeException("Eval on JSValue");
}
}

2
js/js2/java/TryNode.java
Просмотреть файл

@ -31,7 +31,7 @@ class TryNode extends ControlNode {
int count = catchExpr.size();
for (int i = 0; i < count; i++) {
ExpressionNode e = (ExpressionNode)(catchExpr.elementAt(i));
String id = ((JSValue)e).value;
String id = ((JSObject)e).value;
theEnv.theStack.setStack(stackHeight);
theEnv.theGlobals.put(id, new Double(x.getValue().d));
return (ControlNode)(catchCode.elementAt(i));