santiagopg 2003/01/24 10:45:51
Modified: java/src/org/apache/xalan/xsltc/compiler/codemodel Tag:
xslt20 CmMethodCallExpr.java CmReturnStmt.java
CmType.java CmVisitor.java JavaCmVisitor.java
Log:
Committing changes to codemodel by Gopal Sharma ([EMAIL PROTECTED])
Revision Changes Path
No revision
No revision
1.1.2.2 +8 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmMethodCallExpr.java
Index: CmMethodCallExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmMethodCallExpr.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CmMethodCallExpr.java 2 Dec 2002 16:49:41 -0000 1.1.2.1
+++ CmMethodCallExpr.java 24 Jan 2003 18:45:50 -0000 1.1.2.2
@@ -57,7 +57,7 @@
* <http://www.apache.org/>.
*
* @author Santiago Pericas-Geertsen
- *
+ * @author Gopal Sharma
*/
package org.apache.xalan.xsltc.compiler.codemodel;
@@ -101,6 +101,12 @@
{
this(methodName, param1, param2);
_parameters.add(param3);
+ }
+
+ public CmMethodCallExpr(String methodName, List parameters)
+ {
+ _methodName = methodName;
+ _parameters = parameters;
}
public CmMethodCallExpr(CmExpression that, String methodName,
1.1.2.2 +7 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmReturnStmt.java
Index: CmReturnStmt.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmReturnStmt.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CmReturnStmt.java 2 Dec 2002 16:49:41 -0000 1.1.2.1
+++ CmReturnStmt.java 24 Jan 2003 18:45:50 -0000 1.1.2.2
@@ -57,7 +57,7 @@
* <http://www.apache.org/>.
*
* @author Santiago Pericas-Geertsen
- *
+ * @author Gopal Sharma
*/
package org.apache.xalan.xsltc.compiler.codemodel;
@@ -67,7 +67,12 @@
/**
* A reference to an expression.
*/
+
private CmExpression _expression;
+
+ //REVISIT: Do we need these ? -GS
+ //public static final CmReturnStmt instance = new CmReturnStmt();
+ //private CmReturnStmt() {}
public CmReturnStmt(CmExpression expression) {
_expression = expression;
1.1.2.2 +9 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmType.java
Index: CmType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CmType.java 2 Dec 2002 16:49:41 -0000 1.1.2.1
+++ CmType.java 24 Jan 2003 18:45:50 -0000 1.1.2.2
@@ -57,10 +57,17 @@
* <http://www.apache.org/>.
*
* @author Santiago Pericas-Geertsen
- *
+ * @author Gopal Sharma
*/
package org.apache.xalan.xsltc.compiler.codemodel;
public abstract class CmType extends CmNode {
+
+ /** REVIST: see how to create ObjectType Passed
+ private CmType _cmType ;
+ public void createCmType(Object obj) {
+ _cmType = new
+ }
+ */
}
1.1.2.2 +4 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmVisitor.java
Index: CmVisitor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/CmVisitor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CmVisitor.java 2 Dec 2002 16:49:41 -0000 1.1.2.1
+++ CmVisitor.java 24 Jan 2003 18:45:50 -0000 1.1.2.2
@@ -57,7 +57,7 @@
* <http://www.apache.org/>.
*
* @author Santiago Pericas-Geertsen
- *
+ * @author Gopal Sharma
*/
package org.apache.xalan.xsltc.compiler.codemodel;
@@ -79,6 +79,7 @@
public Object visit(CmDoubleType node, Object data);
public Object visit(CmIntegerType node, Object data);
public Object visit(CmStringType node, Object data);
+ public Object visit(CmVoidType node, Object data);
public Object visit(CmEmptyStmt node, Object data);
public Object visit(CmBlockStmt node, Object data);
@@ -95,6 +96,7 @@
public Object visit(CmTryCatchStmt node, Object data);
public Object visit(CmVariableStmt node, Object data);
public Object visit(CmWhileStmt node, Object data);
+ public Object visit(CmSwitchStmt node, Object data);
public Object visit(CmAssignmentExpr node, Object data);
public Object visit(CmBinaryExpr node, Object data);
1.1.2.2 +28 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/JavaCmVisitor.java
Index: JavaCmVisitor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/codemodel/Attic/JavaCmVisitor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JavaCmVisitor.java 2 Dec 2002 16:49:41 -0000 1.1.2.1
+++ JavaCmVisitor.java 24 Jan 2003 18:45:50 -0000 1.1.2.2
@@ -57,7 +57,7 @@
* <http://www.apache.org/>.
*
* @author Santiago Pericas-Geertsen
- *
+ * @author Gopal Sharma
*/
package org.apache.xalan.xsltc.compiler.codemodel;
@@ -290,6 +290,17 @@
}
}
+ public Object visit(CmVoidType node, Object object) {
+ try {
+ _writer.write("void");
+ return object;
+ }
+ catch (IOException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+
// -- CmStatements ---------------------------------------------
public Object visit(CmEmptyStmt node, Object object) {
@@ -511,6 +522,21 @@
throw new RuntimeException(e.getMessage());
}
}
+
+ public Object visit(CmSwitchStmt node, Object object){
+ try {
+ indent(_indentLevel++, _indentSpaces);
+ _writer.write("switch (");
+ object = node.getCondition().accept(this, object);
+ _writer.write(")\n");
+ object = node.getBody().accept(this, object);
+ _indentLevel--;
+ return object;
+ }
+ catch (IOException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
// -- CmExpressions --------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
