natas_hw
/
cbc
mirror of https://github.com/aamine/cbc
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* net/loveruby/cflat/compiler/TypeChecker.java: use (new) CastNode constructor directly. 

* net/loveruby/cflat/ast/CastNode.java: new constructor.


git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@3925 1b9489fe-b721-0410-924e-b54b9192deb8
This commit is contained in:
Minero Aoki 2008-03-01 11:06:36 +00:00
parent f1f140b5d3
commit 1475f08013
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat Mar 1 20:06:33 2008 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/TypeChecker.java: use (new) CastNode
constructor directly.
* net/loveruby/cflat/ast/CastNode.java: new constructor.
Sun Feb 24 23:40:15 2008 Minero Aoki <aamine@loveruby.net>
* net/loveruby/cflat/compiler/TypeChecker.java: implement usual

4
net/loveruby/cflat/ast/CastNode.java
View File

@ -6,6 +6,10 @@ public class CastNode extends ExprNode {
protected TypeNode typeNode;
protected ExprNode expr;
public CastNode(Type t, ExprNode expr) {
this(new TypeNode(t), expr);
}
public CastNode(TypeNode t, ExprNode expr) {
this.typeNode = t;
this.expr = expr;

18
net/loveruby/cflat/compiler/TypeChecker.java
View File

@ -154,7 +154,7 @@ class TypeChecker extends Visitor {
if (! mustBeInteger(node.rhs(), node.operator())) return;
Type t = integralPromotion(node.rhs().type());
if (! t.isSameType(node.rhs().type())) {
node.setRHS(newCastNode(t, node.rhs()));
node.setRHS(new CastNode(t, node.rhs()));
}
return;
}
@ -170,7 +170,7 @@ class TypeChecker extends Visitor {
}
if (! r.isSameType(opType)) {
// cast RHS
node.setRHS(newCastNode(opType, node.rhs()));
node.setRHS(new CastNode(opType, node.rhs()));
}
}
@ -199,10 +199,10 @@ class TypeChecker extends Visitor {
return;
}
else if (t.isCompatible(e)) { // insert cast on thenBody
node.setThenExpr(newCastNode(e, node.thenExpr()));
node.setThenExpr(new CastNode(e, node.thenExpr()));
}
else if (e.isCompatible(t)) { // insert cast on elseBody
node.setElseExpr(newCastNode(t, node.elseExpr()));
node.setElseExpr(new CastNode(t, node.elseExpr()));
}
else {
invalidCastError(node.thenExpr(), e, t);
@ -307,11 +307,11 @@ class TypeChecker extends Visitor {
Type target = usualArithmeticConversion(l, r);
if (! l.isSameType(target)) {
// insert cast on left expr
node.setLeft(newCastNode(target, node.left()));
node.setLeft(new CastNode(target, node.left()));
}
if (! r.isSameType(target)) {
// insert cast on right expr
node.setRight(newCastNode(target, node.right()));
node.setRight(new CastNode(target, node.right()));
}
node.setType(target);
}
@ -425,7 +425,7 @@ class TypeChecker extends Visitor {
warn(expr, "incompatible implicit cast from "
+ expr.type() + " to " + targetType);
}
return newCastNode(targetType, expr);
return new CastNode(targetType, expr);
}
else {
invalidCastError(expr, expr.type(), targetType);
@ -476,10 +476,6 @@ class TypeChecker extends Visitor {
}
// #@@}
protected CastNode newCastNode(Type t, ExprNode n) {
return new CastNode(new TypeNode(t), n);
}
protected boolean isInvalidReturnType(Type t) {
return t.isStruct() || t.isUnion() || t.isArray();
}