X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FIR%2FTree%2FBuildIR.java;h=9e2da3b6433d75d1179f9aa9da285d9e7a54663e;hb=b00cb94ef0988049d74095035f02ed8f241eab77;hp=636821f7c8411cf4c607a008f210e1b82e3565a7;hpb=5851f34441c2c07c26db89e81372b1041ce2765b;p=IRC.git

diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index 636821f7..9e2da3b6 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -1,679 +1,1559 @@
 package IR.Tree;
 import IR.*;
+import Util.Lattice;
 import java.util.*;
 
-
 public class BuildIR {
-    State state;
-    public BuildIR(State state) {
-	this.state=state;
-    }
-    public void buildtree() {
-	for(Iterator it=state.parsetrees.iterator();it.hasNext();) {
-	    ParseNode pn=(ParseNode)it.next();
-	    parseFile(pn);
-	}
+  State state;
+
+  private int m_taskexitnum;
+
+  public BuildIR(State state) {
+    this.state=state;
+    this.m_taskexitnum = 0;
+  }
+
+  public void buildtree(ParseNode pn, Set toanalyze, String sourcefile) {
+    parseFile(pn, toanalyze,sourcefile);
+    
+    // numering the interfaces
+    int if_num = 0;
+    Iterator it_classes = state.getClassSymbolTable().getValueSet().iterator();
+    while(it_classes.hasNext()) {
+      ClassDescriptor cd = (ClassDescriptor)it_classes.next();
+      if(cd.isInterface()) {
+        cd.setInterfaceId(if_num++);
+      }
     }
+  }
 
-    /** Parse the classes in this file */
-    public void parseFile(ParseNode pn) {
-	ParseNode tpn=pn.getChild("type_declaration_list");
-	if (tpn!=null) {
-	    ParseNodeVector pnv=tpn.getChildren();
-	    for(int i=0;i<pnv.size();i++) {
-		ParseNode type_pn=pnv.elementAt(i);
-		if (isEmpty(type_pn)) /* Skip the semicolon */
-		    continue;
-		if (isNode(type_pn,"class_declaration")) {
-		    ClassDescriptor cn=parseTypeDecl(type_pn);
-		    state.addClass(cn);
-		} else if (isNode(type_pn,"task_declaration")) {
-		    TaskDescriptor td=parseTaskDecl(type_pn);
-		    state.addTask(td);
-		} else {
-		    throw new Error(type_pn.getLabel());
-		}
+  Vector singleimports;
+  Vector multiimports;
+  NameDescriptor packages;
+
+  /** Parse the classes in this file */
+  public void parseFile(ParseNode pn, Set toanalyze,String sourcefile) {
+    singleimports=new Vector();
+    multiimports=new Vector();
+    
+    ParseNode ipn=pn.getChild("imports").getChild("import_decls_list");
+    if (ipn!=null) {
+      ParseNodeVector pnv=ipn.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+	ParseNode pnimport=pnv.elementAt(i);
+	NameDescriptor nd=parseName(pnimport.getChild("name"));
+	// TODO need to implement
+	if (isNode(pnimport,"import_single"))
+	  singleimports.add(nd);
+	else
+	  multiimports.add(nd);
+      }
+    }
+    ParseNode ppn=pn.getChild("packages").getChild("package");
+    if (ppn!=null) {
+	// TODO need to implement
+      packages=parseName(ppn.getChild("name"));
+    }
+    ParseNode tpn=pn.getChild("type_declaration_list");
+    if (tpn!=null) {
+      ParseNodeVector pnv=tpn.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+	ParseNode type_pn=pnv.elementAt(i);
+	if (isEmpty(type_pn))         /* Skip the semicolon */
+	  continue;
+	if (isNode(type_pn,"class_declaration")) {
+	  ClassDescriptor cn=parseTypeDecl(type_pn);
+	  cn.setSourceFileName(sourcefile);
+	  parseInitializers(cn);
+	  if (toanalyze!=null)
+	    toanalyze.add(cn);
+	  state.addClass(cn);
+	  // for inner classes/enum
+	  HashSet tovisit = new HashSet();
+	  Iterator it_icds = cn.getInnerClasses();
+	  while(it_icds.hasNext()) {
+	    tovisit.add(it_icds.next());
+	  }
+	  
+	  while(!tovisit.isEmpty()) {
+	    ClassDescriptor cd = (ClassDescriptor)tovisit.iterator().next();
+	    tovisit.remove(cd);
+	    parseInitializers(cd);
+	    if(toanalyze != null) {
+	      toanalyze.add(cd);
 	    }
+	    cd.setSourceFileName(sourcefile);
+	    state.addClass(cd);
+	    
+	    Iterator it_ics = cd.getInnerClasses();
+	    while(it_ics.hasNext()) {
+	      tovisit.add(it_ics.next());
+	    }
+	    
+	    Iterator it_ienums = cd.getEnum();
+	    while(it_ienums.hasNext()) {
+	      ClassDescriptor iecd = (ClassDescriptor)it_ienums.next();
+	      if(toanalyze != null) {
+		toanalyze.add(iecd);
+	      }
+	      iecd.setSourceFileName(sourcefile);
+	      state.addClass(iecd);
+	    }
+	  }
+	  
+	  Iterator it_enums = cn.getEnum();
+	  while(it_enums.hasNext()) {
+	    ClassDescriptor ecd = (ClassDescriptor)it_enums.next();
+	    if(toanalyze != null) {
+	      toanalyze.add(ecd);
+	    }
+	    ecd.setSourceFileName(sourcefile);
+	    state.addClass(ecd);
+	  }
+	} else if (isNode(type_pn,"task_declaration")) {
+	  TaskDescriptor td=parseTaskDecl(type_pn);
+	  if (toanalyze!=null)
+	    toanalyze.add(td);
+	  state.addTask(td);
+	} else if (isNode(type_pn,"interface_declaration")) {
+	  // TODO add version for normal Java later
+	  ClassDescriptor cn = parseInterfaceDecl(type_pn);
+	  if (toanalyze!=null)
+	    toanalyze.add(cn);
+	  cn.setSourceFileName(sourcefile);
+	  state.addClass(cn);
+	  
+	  // for enum
+	  Iterator it_enums = cn.getEnum();
+	  while(it_enums.hasNext()) {
+	    ClassDescriptor ecd = (ClassDescriptor)it_enums.next();
+	    if(toanalyze != null) {
+	      toanalyze.add(ecd);
+	    }
+	    ecd.setSourceFileName(sourcefile);
+	    state.addClass(ecd);
+	  }
+	} else if (isNode(type_pn,"enum_declaration")) {
+	  // TODO add version for normal Java later
+	  ClassDescriptor cn = parseEnumDecl(null, type_pn);
+	  if (toanalyze!=null)
+	    toanalyze.add(cn);
+	  cn.setSourceFileName(sourcefile);
+	  state.addClass(cn);
+	} else {
+	  throw new Error(type_pn.getLabel());
 	}
+      }
     }
+  }
 
-    public TaskDescriptor parseTaskDecl(ParseNode pn) {
-	TaskDescriptor td=new TaskDescriptor(pn.getChild("name").getTerminal());
-	ParseNode bodyn=pn.getChild("body");
-	BlockNode bn=parseBlock(bodyn);
-	parseParameterList(td, pn);
-	state.addTreeCode(td,bn);
-	if (pn.getChild("flag_effects_list")!=null)
-	    td.addFlagEffects(parseFlags(pn.getChild("flag_effects_list")));
-	return td;
-    }
-
-    public Vector parseFlags(ParseNode pn) {
-	Vector vfe=new Vector();
-	ParseNodeVector pnv=pn.getChildren();
-	for(int i=0;i<pnv.size();i++) {
-	    ParseNode fn=pnv.elementAt(i);
-	    FlagEffects fe=parseFlagEffects(fn);
-	    vfe.add(fe);
-	}
-	return vfe;
-    }
-
-    public FlagEffects parseFlagEffects(ParseNode pn) {
-	if (isNode(pn,"flag_effect")) {
-	    String flagname=pn.getChild("name").getTerminal();
-	    FlagEffects fe=new FlagEffects(flagname);
-	    parseFlagEffect(fe, pn.getChild("flag_list"));
-	    return fe;
-	} else throw new Error();
-    }
-
-    public void parseFlagEffect(FlagEffects fes, ParseNode pn) {
-	ParseNodeVector pnv=pn.getChildren();
-	for(int i=0;i<pnv.size();i++) {
-	    ParseNode pn2=pnv.elementAt(i);
-	    boolean status=true;
-	    if (isNode(pn2,"not")) {
-		status=false;
-		pn2=pn2.getChild("name");
-	    }
-	    String name=pn2.getTerminal();
-	    fes.addEffect(new FlagEffect(name,status));
+  public void parseInitializers(ClassDescriptor cn){
+    Vector fv=cn.getFieldVec();
+    int pos = 0;
+    for(int i=0;i<fv.size();i++) {
+      FieldDescriptor fd=(FieldDescriptor)fv.get(i);
+      if(fd.getExpressionNode()!=null) {
+	Iterator methodit = cn.getMethods();
+	while(methodit.hasNext()){
+	  MethodDescriptor currmd=(MethodDescriptor)methodit.next();
+	  if(currmd.isConstructor()){
+	    BlockNode bn=state.getMethodBody(currmd);
+	    NameNode nn=new NameNode(new NameDescriptor(fd.getSymbol()));
+	    AssignmentNode an=new AssignmentNode(nn,fd.getExpressionNode(),new AssignOperation(1));
+	    bn.addBlockStatementAt(new BlockExpressionNode(an), pos);
+	  }
 	}
+	pos++;
+      }
+    }
+  }  
+  
+  private ClassDescriptor parseEnumDecl(ClassDescriptor cn, ParseNode pn) {
+    ClassDescriptor ecd=new ClassDescriptor(pn.getChild("name").getTerminal(), false);
+    ecd.setAsEnum();
+    if(cn != null) {
+      ecd.setSurroundingClass(cn.getSymbol());
+      ecd.setSurrounding(cn);
+      cn.addEnum(ecd);
     }
+    if (!(ecd.getSymbol().equals(TypeUtil.ObjectClass)||
+        ecd.getSymbol().equals(TypeUtil.TagClass))) {
+      ecd.setSuper(TypeUtil.ObjectClass);
+    }
+    ecd.setModifiers(parseModifiersList(pn.getChild("modifiers")));
+    parseEnumBody(ecd, pn.getChild("enumbody"));
+    return ecd;
+  }
+  
+  private void parseEnumBody(ClassDescriptor cn, ParseNode pn) {
+    ParseNode decls=pn.getChild("enum_constants_list");
+    if (decls!=null) {
+      ParseNodeVector pnv=decls.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+        ParseNode decl=pnv.elementAt(i);
+        if (isNode(decl,"enum_constant")) {
+          parseEnumConstant(cn,decl);
+        } else throw new Error();
+      }
+    }
+  }
+  
+  private void parseEnumConstant(ClassDescriptor cn, ParseNode pn) {
+    cn.addEnumConstant(pn.getChild("name").getTerminal());
+  }
+  
+  public ClassDescriptor parseInterfaceDecl(ParseNode pn) {
+    ClassDescriptor cn=new ClassDescriptor(pn.getChild("name").getTerminal(), true);
+    //cn.setAsInterface();
+    if (!isEmpty(pn.getChild("superIF").getTerminal())) {
+      /* parse inherited interface name */
+      ParseNode snlist=pn.getChild("superIF").getChild("extend_interface_list");
+      ParseNodeVector pnv=snlist.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+        ParseNode decl=pnv.elementAt(i);
+        if (isNode(decl,"type")) {
+          NameDescriptor nd=parseName(decl.getChild("class").getChild("name"));
+          cn.addSuperInterface(nd.toString());
+        }
+      }
+    }
+    cn.setModifiers(parseModifiersList(pn.getChild("modifiers")));
+    parseInterfaceBody(cn, pn.getChild("interfacebody"));
+    return cn;
+  }
+  
+  private void parseInterfaceBody(ClassDescriptor cn, ParseNode pn) {
+    assert(cn.isInterface());
+    ParseNode decls=pn.getChild("interface_member_declaration_list");
+    if (decls!=null) {
+      ParseNodeVector pnv=decls.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+        ParseNode decl=pnv.elementAt(i);
+        if (isNode(decl,"constant")) {
+          parseInterfaceConstant(cn,decl);
+        } else if (isNode(decl,"method")) {
+          parseInterfaceMethod(cn,decl.getChild("method_declaration"));
+        } else throw new Error();
+      }
+    }
+  }
+  
+  private void parseInterfaceConstant(ClassDescriptor cn, ParseNode pn) {
+    if (pn!=null) {
+      parseFieldDecl(cn,pn.getChild("field_declaration"));
+      return;
+    }
+    throw new Error();
+  }
+  
+  private void parseInterfaceMethod(ClassDescriptor cn, ParseNode pn) {
+    ParseNode headern=pn.getChild("header");
+    ParseNode bodyn=pn.getChild("body");
+    MethodDescriptor md=parseMethodHeader(headern.getChild("method_header"));
+    md.getModifiers().addModifier(Modifiers.PUBLIC);
+    md.getModifiers().addModifier(Modifiers.ABSTRACT);
+    try {
+      BlockNode bn=parseBlock(bodyn);
+      cn.addMethod(md);
+      state.addTreeCode(md,bn);
 
-    public FlagExpressionNode parseFlagExpression(ParseNode pn) {
-	if (isNode(pn,"or")) {
-	    ParseNodeVector pnv=pn.getChildren();
-	    ParseNode left=pnv.elementAt(0);
-	    ParseNode right=pnv.elementAt(1);
-	    return new FlagOpNode(parseFlagExpression(left), parseFlagExpression(right), new Operation(Operation.LOGIC_OR));
-	} else if (isNode(pn,"and")) {
-	    ParseNodeVector pnv=pn.getChildren();
-	    ParseNode left=pnv.elementAt(0);
-	    ParseNode right=pnv.elementAt(1);
-	    return new FlagOpNode(parseFlagExpression(left), parseFlagExpression(right), new Operation(Operation.LOGIC_AND));
-	} else if (isNode(pn, "not")) {
-	    ParseNodeVector pnv=pn.getChildren();
-	    ParseNode left=pnv.elementAt(0);
-	    return new FlagOpNode(parseFlagExpression(left), new Operation(Operation.LOGIC_NOT));	    
-
-	} else if (isNode(pn,"name")) {
-	    return new FlagNode(pn.getTerminal());
-	} else {
-	    throw new Error();
-	}
+      // this is a hack for investigating new language features
+      // at the AST level, someday should evolve into a nice compiler
+      // option *wink*
+      //if( cn.getSymbol().equals( ***put a class in here like:     "Test" ) &&
+      //    md.getSymbol().equals( ***put your method in here like: "main" ) 
+      //) {
+      //  bn.setStyle( BlockNode.NORMAL );
+      //  System.out.println( bn.printNode( 0 ) );
+      //}
+
+    } catch (Exception e) {
+      System.out.println("Error with method:"+md.getSymbol());
+      e.printStackTrace();
+      throw new Error();
+    } catch (Error e) {
+      System.out.println("Error with method:"+md.getSymbol());
+      e.printStackTrace();
+      throw new Error();
     }
+  }
 
-    public Vector parseChecks(ParseNode pn) {
-	Vector ccs=new Vector();
-	ParseNodeVector pnv=pn.getChildren();
-	for(int i=0;i<pnv.size();i++) {
-	    ParseNode fn=pnv.elementAt(i);
-	    ConstraintCheck cc=parseConstraintCheck(fn);
-	    ccs.add(cc);
-	}
-	return ccs;
+  public TaskDescriptor parseTaskDecl(ParseNode pn) {
+    TaskDescriptor td=new TaskDescriptor(pn.getChild("name").getTerminal());
+    ParseNode bodyn=pn.getChild("body");
+    BlockNode bn=parseBlock(bodyn);
+    parseParameterList(td, pn);
+    state.addTreeCode(td,bn);
+    if (pn.getChild("flag_effects_list")!=null)
+      td.addFlagEffects(parseFlags(pn.getChild("flag_effects_list")));
+    return td;
+  }
+
+  public Vector parseFlags(ParseNode pn) {
+    Vector vfe=new Vector();
+    ParseNodeVector pnv=pn.getChildren();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode fn=pnv.elementAt(i);
+      FlagEffects fe=parseFlagEffects(fn);
+      vfe.add(fe);
     }
+    return vfe;
+  }
 
-    public ConstraintCheck parseConstraintCheck(ParseNode pn) {
-	if (isNode(pn,"cons_check")) {
-	    String specname=pn.getChild("name").getChild("identifier").getTerminal();
-	    Vector[] args=parseConsArgumentList(pn);
-	    ConstraintCheck cc=new ConstraintCheck(specname);
-	    for(int i=0;i<args[0].size();i++) {
-		cc.addVariable((String)args[0].get(i));
-		cc.addArgument((ExpressionNode)args[1].get(i));
-	    }
-	    return cc;
-	} else throw new Error();
-    }
-
-    public void parseParameterList(TaskDescriptor td, ParseNode pn) {
-	ParseNode paramlist=pn.getChild("task_parameter_list");
-	if (paramlist==null)
-	    return;
-	 ParseNodeVector pnv=paramlist.getChildren();
-	 for(int i=0;i<pnv.size();i++) {
-	     ParseNode paramn=pnv.elementAt(i);
-	     TypeDescriptor type=parseTypeDescriptor(paramn);
-
-	     ParseNode tmp=paramn;
-	     while (tmp.getChild("single")==null) {
-		 type=type.makeArray(state);
-		 tmp=tmp.getChild("array");
-	     }
-	     String paramname=tmp.getChild("single").getTerminal();
-	     FlagExpressionNode fen=parseFlagExpression(paramn.getChild("flag").getFirstChild());
-	     
-	     td.addParameter(type,paramname,fen);
-	 }
-    }
-
-    public ClassDescriptor parseTypeDecl(ParseNode pn) {
-	ClassDescriptor cn=new ClassDescriptor(pn.getChild("name").getTerminal());
-	if (!isEmpty(pn.getChild("super").getTerminal())) {
-	    /* parse superclass name */
-	    ParseNode snn=pn.getChild("super").getChild("type").getChild("class").getChild("name");
-	    NameDescriptor nd=parseName(snn);
-	    cn.setSuper(nd.toString());
-	} else {
-	    if (!cn.getSymbol().equals(TypeUtil.ObjectClass))
-		cn.setSuper(TypeUtil.ObjectClass);
-	}
-	cn.setModifiers(parseModifiersList(pn.getChild("modifiers")));
-	parseClassBody(cn, pn.getChild("classbody"));
-	return cn;
+  public FlagEffects parseFlagEffects(ParseNode pn) {
+    if (isNode(pn,"flag_effect")) {
+      String flagname=pn.getChild("name").getTerminal();
+      FlagEffects fe=new FlagEffects(flagname);
+      if (pn.getChild("flag_list")!=null)
+	parseFlagEffect(fe, pn.getChild("flag_list"));
+      if (pn.getChild("tag_list")!=null)
+	parseTagEffect(fe, pn.getChild("tag_list"));
+      return fe;
+    } else throw new Error();
+  }
+
+  public void parseTagEffect(FlagEffects fes, ParseNode pn) {
+    ParseNodeVector pnv=pn.getChildren();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode pn2=pnv.elementAt(i);
+      boolean status=true;
+      if (isNode(pn2,"not")) {
+	status=false;
+	pn2=pn2.getChild("name");
+      }
+      String name=pn2.getTerminal();
+      fes.addTagEffect(new TagEffect(name,status));
     }
+  }
 
-    private void parseClassBody(ClassDescriptor cn, ParseNode pn) {
-	ParseNode decls=pn.getChild("class_body_declaration_list");
-	if (decls!=null) {
-	    ParseNodeVector pnv=decls.getChildren();
-	    for(int i=0;i<pnv.size();i++) {
-		ParseNode decl=pnv.elementAt(i);
-		if (isNode(decl,"member")) {
-		    parseClassMember(cn,decl);
-		} else if (isNode(decl,"constructor")) {
-		    parseConstructorDecl(cn,decl.getChild("constructor_declaration"));
-		} else if (isNode(decl,"block")) {
-		} else throw new Error();
-	    }
-	}
+  public void parseFlagEffect(FlagEffects fes, ParseNode pn) {
+    ParseNodeVector pnv=pn.getChildren();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode pn2=pnv.elementAt(i);
+      boolean status=true;
+      if (isNode(pn2,"not")) {
+	status=false;
+	pn2=pn2.getChild("name");
+      }
+      String name=pn2.getTerminal();
+      fes.addEffect(new FlagEffect(name,status));
     }
+  }
 
-    private void parseClassMember(ClassDescriptor cn, ParseNode pn) {
-	ParseNode fieldnode=pn.getChild("field");
+  public FlagExpressionNode parseFlagExpression(ParseNode pn) {
+    if (isNode(pn,"or")) {
+      ParseNodeVector pnv=pn.getChildren();
+      ParseNode left=pnv.elementAt(0);
+      ParseNode right=pnv.elementAt(1);
+      return new FlagOpNode(parseFlagExpression(left), parseFlagExpression(right), new Operation(Operation.LOGIC_OR));
+    } else if (isNode(pn,"and")) {
+      ParseNodeVector pnv=pn.getChildren();
+      ParseNode left=pnv.elementAt(0);
+      ParseNode right=pnv.elementAt(1);
+      return new FlagOpNode(parseFlagExpression(left), parseFlagExpression(right), new Operation(Operation.LOGIC_AND));
+    } else if (isNode(pn, "not")) {
+      ParseNodeVector pnv=pn.getChildren();
+      ParseNode left=pnv.elementAt(0);
+      return new FlagOpNode(parseFlagExpression(left), new Operation(Operation.LOGIC_NOT));
 
-	if (fieldnode!=null) {
-	    parseFieldDecl(cn,fieldnode.getChild("field_declaration"));
-	    return;
-	}
-	ParseNode methodnode=pn.getChild("method");
-	if (methodnode!=null) {
-	    parseMethodDecl(cn,methodnode.getChild("method_declaration"));
-	    return;
-	}
-	ParseNode flagnode=pn.getChild("flag");
-	if (flagnode!=null) {
-	    parseFlagDecl(cn, flagnode.getChild("flag_declaration"));
-	    return;
-	}
-	throw new Error();
+    } else if (isNode(pn,"name")) {
+      return new FlagNode(pn.getTerminal());
+    } else {
+      throw new Error();
     }
+  }
 
-    private TypeDescriptor parseTypeDescriptor(ParseNode pn) {
-	ParseNode tn=pn.getChild("type");
-
-	String type_st=tn.getTerminal();
-	if(type_st.equals("byte")) {
-	    return state.getTypeDescriptor(TypeDescriptor.BYTE);
-	} else if(type_st.equals("short")) {
-	    return state.getTypeDescriptor(TypeDescriptor.SHORT);
-	} else if(type_st.equals("boolean")) {
-	    return state.getTypeDescriptor(TypeDescriptor.BOOLEAN);
-	} else if(type_st.equals("int")) {
-	    return state.getTypeDescriptor(TypeDescriptor.INT);
-	} else if(type_st.equals("long")) {
-	    return state.getTypeDescriptor(TypeDescriptor.LONG);
-	} else if(type_st.equals("char")) {
-	    return state.getTypeDescriptor(TypeDescriptor.CHAR);
-	} else if(type_st.equals("float")) {
-	    return state.getTypeDescriptor(TypeDescriptor.FLOAT);
-	} else if(type_st.equals("double")) {
-	    return state.getTypeDescriptor(TypeDescriptor.DOUBLE);
-	} else if(type_st.equals("class")) {
-	    ParseNode nn=tn.getChild("class");
-	    return state.getTypeDescriptor(parseName(nn.getChild("name")));
-	} else if(type_st.equals("array")) {
-	    ParseNode nn=tn.getChild("array");
-	    TypeDescriptor td=parseTypeDescriptor(nn.getChild("basetype"));
-	    Integer numdims=(Integer)nn.getChild("dims").getLiteral();
-	    for(int i=0;i<numdims.intValue();i++)
-		td=td.makeArray(state);
-	    return td;
-	} else {
-	    throw new Error();
-	}
+  public Vector parseChecks(ParseNode pn) {
+    Vector ccs=new Vector();
+    ParseNodeVector pnv=pn.getChildren();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode fn=pnv.elementAt(i);
+      ConstraintCheck cc=parseConstraintCheck(fn);
+      ccs.add(cc);
     }
+    return ccs;
+  }
 
-    private NameDescriptor parseName(ParseNode nn) {
-	ParseNode base=nn.getChild("base");
-	ParseNode id=nn.getChild("identifier");
-	if (base==null)
-	    return new NameDescriptor(id.getTerminal());
-	return new NameDescriptor(parseName(base.getChild("name")),id.getTerminal());
-	
+  public ConstraintCheck parseConstraintCheck(ParseNode pn) {
+    if (isNode(pn,"cons_check")) {
+      String specname=pn.getChild("name").getChild("identifier").getTerminal();
+      Vector[] args=parseConsArgumentList(pn);
+      ConstraintCheck cc=new ConstraintCheck(specname);
+      for(int i=0; i<args[0].size(); i++) {
+	cc.addVariable((String)args[0].get(i));
+	cc.addArgument((ExpressionNode)args[1].get(i));
+      }
+      return cc;
+    } else throw new Error();
+  }
+
+  public void parseParameterList(TaskDescriptor td, ParseNode pn) {
+
+    boolean optional;
+    ParseNode paramlist=pn.getChild("task_parameter_list");
+    if (paramlist==null)
+      return;
+    ParseNodeVector pnv=paramlist.getChildren();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode paramn=pnv.elementAt(i);
+      if(paramn.getChild("optional")!=null) {
+	optional = true;
+	paramn = paramn.getChild("optional").getFirstChild();
+	System.out.println("OPTIONAL FOUND!!!!!!!");
+      } else { optional = false;
+	       System.out.println("NOT OPTIONAL");}
+
+      TypeDescriptor type=parseTypeDescriptor(paramn);
+
+      String paramname=paramn.getChild("single").getTerminal();
+      FlagExpressionNode fen=null;
+      if (paramn.getChild("flag")!=null)
+	fen=parseFlagExpression(paramn.getChild("flag").getFirstChild());
+
+      ParseNode tagnode=paramn.getChild("tag");
+
+      TagExpressionList tel=null;
+      if (tagnode!=null) {
+	tel=parseTagExpressionList(tagnode);
+      }
+
+      td.addParameter(type,paramname,fen, tel, optional);
     }
+  }
 
-    private void parseFlagDecl(ClassDescriptor cn,ParseNode pn) {
-	String name=pn.getChild("name").getTerminal();
-	FlagDescriptor flag=new FlagDescriptor(name);
-	if (pn.getChild("external")!=null)
-	    flag.makeExternal();
-	cn.addFlag(flag);
+  public TagExpressionList parseTagExpressionList(ParseNode pn) {
+    //BUG FIX: change pn.getChildren() to pn.getChild("tag_expression_list").getChildren()
+    //To test, feed in any input program that uses tags
+    ParseNodeVector pnv=pn.getChild("tag_expression_list").getChildren();
+    TagExpressionList tel=new TagExpressionList();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode tn=pnv.elementAt(i);
+      String type=tn.getChild("type").getTerminal();
+      String name=tn.getChild("single").getTerminal();
+      tel.addTag(type, name);
     }
+    return tel;
+  }
 
-    private void parseFieldDecl(ClassDescriptor cn,ParseNode pn) {
-	ParseNode mn=pn.getChild("modifier");
-	Modifiers m=parseModifiersList(mn);
+  public ClassDescriptor parseTypeDecl(ParseNode pn) {
+    ClassDescriptor cn=new ClassDescriptor(pn.getChild("name").getTerminal(), false);
+    if (!isEmpty(pn.getChild("super").getTerminal())) {
+      /* parse superclass name */
+      ParseNode snn=pn.getChild("super").getChild("type").getChild("class").getChild("name");
+      NameDescriptor nd=parseName(snn);
+      cn.setSuper(nd.toString());
+    } else {
+      if (!(cn.getSymbol().equals(TypeUtil.ObjectClass)||
+            cn.getSymbol().equals(TypeUtil.TagClass)))
+	cn.setSuper(TypeUtil.ObjectClass);
+    }
+    // check inherited interfaces
+    if (!isEmpty(pn.getChild("superIF").getTerminal())) {
+      /* parse inherited interface name */
+      ParseNode snlist=pn.getChild("superIF").getChild("interface_type_list");
+      ParseNodeVector pnv=snlist.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+        ParseNode decl=pnv.elementAt(i);
+        if (isNode(decl,"type")) {
+          NameDescriptor nd=parseName(decl.getChild("class").getChild("name"));
+          cn.addSuperInterface(nd.toString());
+        }
+      }
+    }
+    cn.setModifiers(parseModifiersList(pn.getChild("modifiers")));
+    parseClassBody(cn, pn.getChild("classbody"));
+    
+    boolean hasConstructor = false;
+    for(Iterator method_it=cn.getMethods(); method_it.hasNext();) {
+      MethodDescriptor md=(MethodDescriptor)method_it.next();
+      hasConstructor |= md.isConstructor();
+    }
+    if((!hasConstructor) && (!cn.isEnum())) {
+      // add a default constructor for this class
+      MethodDescriptor md = new MethodDescriptor(new Modifiers(Modifiers.PUBLIC),
+          cn.getSymbol(), false);
+      BlockNode bn=new BlockNode();
+      state.addTreeCode(md,bn);
+      md.setDefaultConstructor();
+      cn.addMethod(md);
+    }
+    return cn;
+  }
 
-	ParseNode tn=pn.getChild("type");
-	TypeDescriptor t=parseTypeDescriptor(tn);
-	ParseNode vn=pn.getChild("variables").getChild("variable_declarators_list");
-	ParseNodeVector pnv=vn.getChildren();
-	for(int i=0;i<pnv.size();i++) {
-	    ParseNode vardecl=pnv.elementAt(i);
+  private void parseClassBody(ClassDescriptor cn, ParseNode pn) {
+    ParseNode decls=pn.getChild("class_body_declaration_list");
+    if (decls!=null) {
+      ParseNodeVector pnv=decls.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+	ParseNode decl=pnv.elementAt(i);
+	if (isNode(decl,"member")) {
+	  parseClassMember(cn,decl);
+	} else if (isNode(decl,"constructor")) {
+	  parseConstructorDecl(cn,decl.getChild("constructor_declaration"));
+	} else if (isNode(decl, "static_block")) {
+	  parseStaticBlockDecl(cn, decl.getChild("static_block_declaration"));
+	} else if (isNode(decl,"block")) {
+	} else if (isNode(decl,"location_order_declaration")) {
+	  parseLocationOrder(cn,decl.getChild("location_order_list"));
+  } else throw new Error();
+      }
+    }
+  }
+  
+  private void parseLocationOrder(ClassDescriptor cd, ParseNode pn) {
+    ParseNodeVector pnv = pn.getChildren();
+    Lattice<String> locOrder =
+        new Lattice<String>("_top_","_bottom_");            
+    Set<String> spinLocSet=new HashSet<String>();
+    for (int i = 0; i < pnv.size(); i++) {
+      ParseNode loc = pnv.elementAt(i);
+      if(isNode(loc,"location_property")){
+        String spinLoc=loc.getChildren().elementAt(0).getLabel();
+        spinLocSet.add(spinLoc);
+      }else{
+        String lowerLoc=loc.getChildren().elementAt(0).getLabel();
+        String higherLoc= loc.getChildren().elementAt(1).getLabel();
+        locOrder.put(higherLoc, lowerLoc);
+        if (locOrder.isIntroducingCycle(higherLoc)) {
+          throw new Error("Error: the order relation " + lowerLoc + " < " + higherLoc
+              + " introduces a cycle.");
+        }
+      }
+    }
+    if(spinLocSet.size()>0){
+      //checking if location is actually defined in the hierarchy
+      for (Iterator iterator = spinLocSet.iterator(); iterator.hasNext();) {
+        String locID = (String) iterator.next();
+        if(!locOrder.containsKey(locID)){
+          throw new Error("Error: The spinning location '"+
+              locID + "' is not defined in the hierarchy of the class '"+cd +"'.");
+        }
+      }
+      state.addLocationPropertySet(cd, spinLocSet);
+    }
+    state.addLocationOrder(cd, locOrder);
+  }
+  
+  private void parseClassMember(ClassDescriptor cn, ParseNode pn) {
+    ParseNode fieldnode=pn.getChild("field");
+    if (fieldnode!=null) {
+      parseFieldDecl(cn,fieldnode.getChild("field_declaration"));
+      return;
+    }
+    ParseNode methodnode=pn.getChild("method");
+    if (methodnode!=null) {
+      parseMethodDecl(cn,methodnode.getChild("method_declaration"));
+      return;
+    }
+    ParseNode innerclassnode=pn.getChild("inner_class_declaration");
+    if (innerclassnode!=null) {
+      parseInnerClassDecl(cn,innerclassnode);
+      return;
+    }
+    ParseNode enumnode=pn.getChild("enum_declaration");
+    if (enumnode!=null) {
+      parseEnumDecl(cn,enumnode);
+      return;
+    }
+    ParseNode flagnode=pn.getChild("flag");
+    if (flagnode!=null) {
+      parseFlagDecl(cn, flagnode.getChild("flag_declaration"));
+      return;
+    }
+    // in case there are empty node
+    ParseNode emptynode=pn.getChild("empty");
+    if(emptynode != null) {
+      return;
+    }
+    throw new Error();
+  }
+  
+  private ClassDescriptor parseInnerClassDecl(ClassDescriptor cn, ParseNode pn) {
+    ClassDescriptor icn=new ClassDescriptor(pn.getChild("name").getTerminal(), false);
+    icn.setAsInnerClass();
+    icn.setSurroundingClass(cn.getSymbol());
+    icn.setSurrounding(cn);
+    cn.addInnerClass(icn);
+    if (!isEmpty(pn.getChild("super").getTerminal())) {
+      /* parse superclass name */
+      ParseNode snn=pn.getChild("super").getChild("type").getChild("class").getChild("name");
+      NameDescriptor nd=parseName(snn);
+      icn.setSuper(nd.toString());
+    } else {
+      if (!(icn.getSymbol().equals(TypeUtil.ObjectClass)||
+          icn.getSymbol().equals(TypeUtil.TagClass)))
+        icn.setSuper(TypeUtil.ObjectClass);
+    }
+    // check inherited interfaces
+    if (!isEmpty(pn.getChild("superIF").getTerminal())) {
+      /* parse inherited interface name */
+      ParseNode snlist=pn.getChild("superIF").getChild("interface_type_list");
+      ParseNodeVector pnv=snlist.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+        ParseNode decl=pnv.elementAt(i);
+        if (isNode(decl,"type")) {
+          NameDescriptor nd=parseName(decl.getChild("class").getChild("name"));
+          icn.addSuperInterface(nd.toString());
+        }
+      }
+    }
+    icn.setModifiers(parseModifiersList(pn.getChild("modifiers")));
+    if(!icn.isStatic()) {
+      throw new Error("Error: inner class " + icn.getSymbol() + " in Class " + 
+          cn.getSymbol() + " is not a nested class and is not supported yet!");
+    }
+    parseClassBody(icn, pn.getChild("classbody"));
+    return icn;
+  }
 
-	    
-	    ParseNode tmp=vardecl;
-	    TypeDescriptor arrayt=t;
-	    while (tmp.getChild("single")==null) {
-		arrayt=arrayt.makeArray(state);
-		tmp=tmp.getChild("array");
-	    }
-	    String identifier=tmp.getChild("single").getTerminal();
+  private TypeDescriptor parseTypeDescriptor(ParseNode pn) {
+    ParseNode tn=pn.getChild("type");
+    String type_st=tn.getTerminal();
+    if(type_st.equals("byte")) {
+      return state.getTypeDescriptor(TypeDescriptor.BYTE);
+    } else if(type_st.equals("short")) {
+      return state.getTypeDescriptor(TypeDescriptor.SHORT);
+    } else if(type_st.equals("boolean")) {
+      return state.getTypeDescriptor(TypeDescriptor.BOOLEAN);
+    } else if(type_st.equals("int")) {
+      return state.getTypeDescriptor(TypeDescriptor.INT);
+    } else if(type_st.equals("long")) {
+      return state.getTypeDescriptor(TypeDescriptor.LONG);
+    } else if(type_st.equals("char")) {
+      return state.getTypeDescriptor(TypeDescriptor.CHAR);
+    } else if(type_st.equals("float")) {
+      return state.getTypeDescriptor(TypeDescriptor.FLOAT);
+    } else if(type_st.equals("double")) {
+      return state.getTypeDescriptor(TypeDescriptor.DOUBLE);
+    } else if(type_st.equals("class")) {
+      ParseNode nn=tn.getChild("class");
+      return state.getTypeDescriptor(parseName(nn.getChild("name")));
+    } else if(type_st.equals("array")) {
+      ParseNode nn=tn.getChild("array");
+      TypeDescriptor td=parseTypeDescriptor(nn.getChild("basetype"));
+      Integer numdims=(Integer)nn.getChild("dims").getLiteral();
+      for(int i=0; i<numdims.intValue(); i++)
+	td=td.makeArray(state);
+      return td;
+    } else {
+      System.out.println(pn.PPrint(2, true));
+      throw new Error();
+    }
+  }
 
-	    ParseNode epn=vardecl.getChild("initializer");
-	    
-	    ExpressionNode en=null;
-	    if (epn!=null)
-		en=parseExpression(epn.getFirstChild());
+  private NameDescriptor parseName(ParseNode nn) {
+    ParseNode base=nn.getChild("base");
+    ParseNode id=nn.getChild("identifier");
+    if (base==null)
+      return new NameDescriptor(id.getTerminal());
+    return new NameDescriptor(parseName(base.getChild("name")),id.getTerminal());
+
+  }
+
+  private void parseFlagDecl(ClassDescriptor cn,ParseNode pn) {
+    String name=pn.getChild("name").getTerminal();
+    FlagDescriptor flag=new FlagDescriptor(name);
+    if (pn.getChild("external")!=null)
+      flag.makeExternal();
+    cn.addFlag(flag);
+  }
+
+  private void parseFieldDecl(ClassDescriptor cn,ParseNode pn) {
+    ParseNode mn=pn.getChild("modifier");
+    Modifiers m=parseModifiersList(mn);
+    if(cn.isInterface()) {
+      // TODO add version for normal Java later
+      // Can only be PUBLIC or STATIC or FINAL
+      if((m.isAbstract()) || (m.isAtomic()) || (m.isNative()) 
+          || (m.isSynchronized())) {
+        throw new Error("Error: field in Interface " + cn.getSymbol() + "can only be PUBLIC or STATIC or FINAL");
+      }
+      m.addModifier(Modifiers.PUBLIC);
+      m.addModifier(Modifiers.STATIC);
+      m.addModifier(Modifiers.FINAL);
+    }
+
+    ParseNode tn=pn.getChild("type");
+    TypeDescriptor t=parseTypeDescriptor(tn);
+    assignAnnotationsToType(m,t);
+    ParseNode vn=pn.getChild("variables").getChild("variable_declarators_list");
+    ParseNodeVector pnv=vn.getChildren();
+    boolean isglobal=pn.getChild("global")!=null;
+
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode vardecl=pnv.elementAt(i);
+      ParseNode tmp=vardecl;
+      TypeDescriptor arrayt=t;
+      while (tmp.getChild("single")==null) {
+	arrayt=arrayt.makeArray(state);
+	tmp=tmp.getChild("array");
+      }
+      String identifier=tmp.getChild("single").getTerminal();
+      ParseNode epn=vardecl.getChild("initializer");
+
+      ExpressionNode en=null;
+      if (epn!=null) {
+        en=parseExpression(epn.getFirstChild());
+        en.setNumLine(epn.getFirstChild().getLine());
+        if(m.isStatic()) {
+          // for static field, the initializer should be considered as a 
+          // static block
+          boolean isfirst = false;
+          MethodDescriptor md = (MethodDescriptor)cn.getMethodTable().getFromSameScope("staticblocks");
+          if(md == null) {
+            // the first static block for this class
+            Modifiers m_i=new Modifiers();
+            m_i.addModifier(Modifiers.STATIC);
+            md = new MethodDescriptor(m_i, "staticblocks", false);
+            md.setAsStaticBlock();
+            isfirst = true;
+          }
+          if(isfirst) {
+            cn.addMethod(md);
+          }
+          cn.incStaticBlocks();
+          BlockNode bn=new BlockNode();
+          NameNode nn=new NameNode(new NameDescriptor(identifier));
+          nn.setNumLine(en.getNumLine());
+          AssignmentNode an=new AssignmentNode(nn,en,new AssignOperation(1));
+          an.setNumLine(pn.getLine());
+          bn.addBlockStatement(new BlockExpressionNode(an));
+          if(isfirst) {
+            state.addTreeCode(md,bn);
+          } else {
+            BlockNode obn = state.getMethodBody(md);
+            for(int ii = 0; ii < bn.size(); ii++) {
+              BlockStatementNode bsn = bn.get(ii);
+              obn.addBlockStatement(bsn);
+            }
+            state.addTreeCode(md, obn);
+            bn = null;
+          }
+          en = null;
+        }
+      }
+
+      cn.addField(new FieldDescriptor(m, arrayt, identifier, en, isglobal));
+    }
+  }
   
-	    cn.addField(new FieldDescriptor(m,arrayt,identifier, en));
-	}
-	
+  private void assignAnnotationsToType(Modifiers modifiers, TypeDescriptor type){
+    Vector<AnnotationDescriptor> annotations=modifiers.getAnnotations();
+    for(int i=0; i<annotations.size(); i++) {
+      // it only supports a marker annotation
+      AnnotationDescriptor an=annotations.elementAt(i);
+      type.addAnnotationMarker(an);           
+    }    
+  }
+
+  int innerCount=0;
+
+  private ExpressionNode parseExpression(ParseNode pn) {
+    if (isNode(pn,"assignment"))
+      return parseAssignmentExpression(pn);
+    else if (isNode(pn,"logical_or")||isNode(pn,"logical_and")||
+             isNode(pn,"bitwise_or")||isNode(pn,"bitwise_xor")||
+             isNode(pn,"bitwise_and")||isNode(pn,"equal")||
+             isNode(pn,"not_equal")||isNode(pn,"comp_lt")||
+             isNode(pn,"comp_lte")||isNode(pn,"comp_gt")||
+             isNode(pn,"comp_gte")||isNode(pn,"leftshift")||
+             isNode(pn,"rightshift")||isNode(pn,"sub")||
+             isNode(pn,"urightshift")||isNode(pn,"sub")||
+             isNode(pn,"add")||isNode(pn,"mult")||
+             isNode(pn,"div")||isNode(pn,"mod")) {
+      ParseNodeVector pnv=pn.getChildren();
+      ParseNode left=pnv.elementAt(0);
+      ParseNode right=pnv.elementAt(1);
+      Operation op=new Operation(pn.getLabel());
+      OpNode on=new OpNode(parseExpression(left),parseExpression(right),op);
+      on.setNumLine(pn.getLine());
+      return on;
+    } else if (isNode(pn,"unaryplus")||
+               isNode(pn,"unaryminus")||
+               isNode(pn,"not")||
+               isNode(pn,"comp")) {
+      ParseNode left=pn.getFirstChild();
+      Operation op=new Operation(pn.getLabel());
+      OpNode on=new OpNode(parseExpression(left),op);
+      on.setNumLine(pn.getLine());
+      return on;
+    } else if (isNode(pn,"postinc")||
+               isNode(pn,"postdec")) {
+      ParseNode left=pn.getFirstChild();
+      AssignOperation op=new AssignOperation(pn.getLabel());
+      AssignmentNode an=new AssignmentNode(parseExpression(left),null,op);
+      an.setNumLine(pn.getLine());
+      return an;
+
+    } else if (isNode(pn,"preinc")||
+               isNode(pn,"predec")) {
+      ParseNode left=pn.getFirstChild();
+      AssignOperation op=isNode(pn,"preinc") ? new AssignOperation(AssignOperation.PLUSEQ) : new AssignOperation(AssignOperation.MINUSEQ);
+      AssignmentNode an=new AssignmentNode(parseExpression(left),
+          new LiteralNode("integer",new Integer(1)),op);
+      an.setNumLine(pn.getLine());
+      return an;
+    } else if (isNode(pn,"literal")) {
+      String literaltype=pn.getTerminal();
+      ParseNode literalnode=pn.getChild(literaltype);
+      Object literal_obj=literalnode.getLiteral();      
+      LiteralNode ln=new LiteralNode(literaltype, literal_obj);
+      ln.setNumLine(pn.getLine());
+      return ln;
+    } else if (isNode(pn,"createobject")) {
+      TypeDescriptor td=parseTypeDescriptor(pn);
+      
+      Vector args=parseArgumentList(pn);
+      boolean isglobal=pn.getChild("global")!=null||
+	pn.getChild("scratch")!=null;
+      String disjointId=null;
+      if( pn.getChild("disjoint") != null) {
+	disjointId = pn.getChild("disjoint").getTerminal();
+      }
+      CreateObjectNode con=new CreateObjectNode(td, isglobal, disjointId);
+      con.setNumLine(pn.getLine());
+      for(int i=0; i<args.size(); i++) {
+	con.addArgument((ExpressionNode)args.get(i));
+      }
+      /* Could have flag set or tag added here */
+      if (pn.getChild("flag_list")!=null||pn.getChild("tag_list")!=null) {
+	FlagEffects fe=new FlagEffects(null);
+	if (pn.getChild("flag_list")!=null)
+	  parseFlagEffect(fe, pn.getChild("flag_list"));
+
+	if (pn.getChild("tag_list")!=null)
+	  parseTagEffect(fe, pn.getChild("tag_list"));
+	con.addFlagEffects(fe);
+      }
+
+      return con;
+    } else if (isNode(pn,"createobjectcls")) {
+      //TODO:::  FIX BUG!!!  static fields in caller context need to become parameters
+      TypeDescriptor td=parseTypeDescriptor(pn);
+      innerCount++;
+      ClassDescriptor cnnew=new ClassDescriptor(td.getSymbol()+"$"+innerCount, false);
+      cnnew.setSuper(td.getSymbol());
+      parseClassBody(cnnew, pn.getChild("decl").getChild("classbody"));
+      Vector args=parseArgumentList(pn);
+
+      CreateObjectNode con=new CreateObjectNode(td, false, null);
+      con.setNumLine(pn.getLine());
+      for(int i=0; i<args.size(); i++) {
+	con.addArgument((ExpressionNode)args.get(i));
+      }
+
+      return con;
+    } else if (isNode(pn,"createarray")) {
+      //System.out.println(pn.PPrint(3,true));
+      boolean isglobal=pn.getChild("global")!=null||
+	pn.getChild("scratch")!=null;
+      String disjointId=null;
+      if( pn.getChild("disjoint") != null) {
+	disjointId = pn.getChild("disjoint").getTerminal();
+      }
+      TypeDescriptor td=parseTypeDescriptor(pn);
+      Vector args=parseDimExprs(pn);
+      int num=0;
+      if (pn.getChild("dims_opt").getLiteral()!=null)
+	num=((Integer)pn.getChild("dims_opt").getLiteral()).intValue();
+      for(int i=0; i<(args.size()+num); i++)
+	td=td.makeArray(state);
+      CreateObjectNode con=new CreateObjectNode(td, isglobal, disjointId);
+      con.setNumLine(pn.getLine());
+      for(int i=0; i<args.size(); i++) {
+	con.addArgument((ExpressionNode)args.get(i));
+      }
+      return con;
+    } if (isNode(pn,"createarray2")) {
+      TypeDescriptor td=parseTypeDescriptor(pn);
+      int num=0;
+      if (pn.getChild("dims_opt").getLiteral()!=null)
+    num=((Integer)pn.getChild("dims_opt").getLiteral()).intValue();
+      for(int i=0; i<num; i++)
+    td=td.makeArray(state);
+      CreateObjectNode con=new CreateObjectNode(td, false, null);
+      con.setNumLine(pn.getLine());
+      ParseNode ipn = pn.getChild("initializer");     
+      Vector initializers=parseVariableInitializerList(ipn);
+      ArrayInitializerNode ain = new ArrayInitializerNode(initializers);
+      ain.setNumLine(pn.getLine());
+      con.addArrayInitializer(ain);
+      return con;
+    } else if (isNode(pn,"name")) {
+      NameDescriptor nd=parseName(pn);
+      NameNode nn=new NameNode(nd);
+      nn.setNumLine(pn.getLine());
+      return nn;
+    } else if (isNode(pn,"this")) {
+      NameDescriptor nd=new NameDescriptor("this");
+      NameNode nn=new NameNode(nd);
+      nn.setNumLine(pn.getLine());
+      return nn;
+    } else if (isNode(pn,"isavailable")) {
+      NameDescriptor nd=new NameDescriptor(pn.getTerminal());
+      NameNode nn=new NameNode(nd);
+      nn.setNumLine(pn.getLine());
+      return new OpNode(nn,null,new Operation(Operation.ISAVAILABLE));
+    } else if (isNode(pn,"methodinvoke1")) {
+      NameDescriptor nd=parseName(pn.getChild("name"));
+      Vector args=parseArgumentList(pn);
+      MethodInvokeNode min=new MethodInvokeNode(nd);
+      min.setNumLine(pn.getLine());
+      for(int i=0; i<args.size(); i++) {
+	min.addArgument((ExpressionNode)args.get(i));
+      }
+      return min;
+    } else if (isNode(pn,"methodinvoke2")) {
+      String methodid=pn.getChild("id").getTerminal();
+      ExpressionNode exp=parseExpression(pn.getChild("base").getFirstChild());
+      Vector args=parseArgumentList(pn);
+      MethodInvokeNode min=new MethodInvokeNode(methodid,exp);
+      min.setNumLine(pn.getLine());
+      for(int i=0; i<args.size(); i++) {
+	min.addArgument((ExpressionNode)args.get(i));
+      }
+      return min;
+    } else if (isNode(pn,"fieldaccess")) {
+      ExpressionNode en=parseExpression(pn.getChild("base").getFirstChild());
+      String fieldname=pn.getChild("field").getTerminal();
+      
+      FieldAccessNode fan=new FieldAccessNode(en,fieldname);
+      fan.setNumLine(pn.getLine());
+      return fan;
+    } else if (isNode(pn,"arrayaccess")) {
+      ExpressionNode en=parseExpression(pn.getChild("base").getFirstChild());
+      ExpressionNode index=parseExpression(pn.getChild("index").getFirstChild());
+      ArrayAccessNode aan=new ArrayAccessNode(en,index);
+      aan.setNumLine(pn.getLine());
+      return aan;
+    } else if (isNode(pn,"cast1")) {
+      try {
+  CastNode cn=new CastNode(parseTypeDescriptor(pn.getChild("type")),parseExpression(pn.getChild("exp").getFirstChild()));
+  cn.setNumLine(pn.getLine());      
+	return cn;
+      } catch (Exception e) {
+	System.out.println(pn.PPrint(1,true));
+	e.printStackTrace();
+	throw new Error();
+      }
+    } else if (isNode(pn,"cast2")) {
+      CastNode cn=new CastNode(parseExpression(pn.getChild("type").getFirstChild()),parseExpression(pn.getChild("exp").getFirstChild()));
+      cn.setNumLine(pn.getLine());
+      return cn;
+    } else if (isNode(pn, "getoffset")) {
+      TypeDescriptor td=parseTypeDescriptor(pn);
+      String fieldname = pn.getChild("field").getTerminal();
+      //System.out.println("Checking the values of: "+ " td.toString()= " + td.toString()+ "  fieldname= " + fieldname);
+      return new OffsetNode(td, fieldname);
+    } else if (isNode(pn, "tert")) {
+      
+      TertiaryNode tn=new TertiaryNode(parseExpression(pn.getChild("cond").getFirstChild()),
+          parseExpression(pn.getChild("trueexpr").getFirstChild()),
+          parseExpression(pn.getChild("falseexpr").getFirstChild()) );
+      tn.setNumLine(pn.getLine());
+      
+      return tn;
+    } else if (isNode(pn, "instanceof")) {
+      ExpressionNode exp=parseExpression(pn.getChild("exp").getFirstChild());
+      TypeDescriptor t=parseTypeDescriptor(pn);
+      InstanceOfNode ion=new InstanceOfNode(exp,t);
+      ion.setNumLine(pn.getLine());
+      return ion;
+    } else if (isNode(pn, "array_initializer")) {  
+      Vector initializers=parseVariableInitializerList(pn);
+      return new ArrayInitializerNode(initializers);
+    } else if (isNode(pn, "class_type")) {
+      TypeDescriptor td=parseTypeDescriptor(pn);
+      ClassTypeNode ctn=new ClassTypeNode(td);
+      ctn.setNumLine(pn.getLine());
+      return ctn;
+    } else if (isNode(pn, "empty")) {
+      return null;
+    } else {
+      System.out.println("---------------------");
+      System.out.println(pn.PPrint(3,true));
+      throw new Error();
     }
+  }
 
-    private ExpressionNode parseExpression(ParseNode pn) {
-	if (isNode(pn,"assignment"))
-	    return parseAssignmentExpression(pn);
-	else if (isNode(pn,"logical_or")||isNode(pn,"logical_and")||
-		 isNode(pn,"bitwise_or")||isNode(pn,"bitwise_xor")||
-		 isNode(pn,"bitwise_and")||isNode(pn,"equal")||
-		 isNode(pn,"not_equal")||isNode(pn,"comp_lt")||
-		 isNode(pn,"comp_lte")||isNode(pn,"comp_gt")||
-		 isNode(pn,"comp_gte")||isNode(pn,"leftshift")||
-		 isNode(pn,"rightshift")||isNode(pn,"sub")||
-		 isNode(pn,"add")||isNode(pn,"mult")||
-		 isNode(pn,"div")||isNode(pn,"mod")) {
-	    ParseNodeVector pnv=pn.getChildren();
-	    ParseNode left=pnv.elementAt(0);
-	    ParseNode right=pnv.elementAt(1);
-	    Operation op=new Operation(pn.getLabel());
-   	    return new OpNode(parseExpression(left),parseExpression(right),op);
-	} else if (isNode(pn,"unaryplus")||
-		   isNode(pn,"unaryminus")||
-		   isNode(pn,"not")) {
-	    ParseNode left=pn.getFirstChild();
-	    Operation op=new Operation(pn.getLabel());
-   	    return new OpNode(parseExpression(left),op);
-	} else if (isNode(pn,"postinc")||
-		   isNode(pn,"postdec")) {
-	    ParseNode left=pn.getFirstChild();
-	    AssignOperation op=new AssignOperation(pn.getLabel());
-   	    return new AssignmentNode(parseExpression(left),null,op);
-
-	} else if (isNode(pn,"preinc")||
-		   isNode(pn,"predec")) {
-	    ParseNode left=pn.getFirstChild();
-	    AssignOperation op=isNode(pn,"preinc")?new AssignOperation(AssignOperation.PLUSEQ):new AssignOperation(AssignOperation.MINUSEQ);
-   	    return new AssignmentNode(parseExpression(left),
-				      new LiteralNode("integer",new Integer(1)),op);
-	} else if (isNode(pn,"literal")) {
-	    String literaltype=pn.getTerminal();
-	    ParseNode literalnode=pn.getChild(literaltype);
-	    Object literal_obj=literalnode.getLiteral();
-	    return new LiteralNode(literaltype, literal_obj);
-	} else if (isNode(pn,"createobject")) {
-	    TypeDescriptor td=parseTypeDescriptor(pn);
-	    Vector args=parseArgumentList(pn);
-	    CreateObjectNode con=new CreateObjectNode(td);
-	    for(int i=0;i<args.size();i++) {
-		con.addArgument((ExpressionNode)args.get(i));
-	    }
-	    /* Could have flag set here */
-	    if (pn.getChild("flag_list")!=null) {
-		FlagEffects fe=new FlagEffects(null);
-		parseFlagEffect(fe, pn.getChild("flag_list"));
-		con.addFlagEffects(fe);
-	    }
-	    return con;
-	} else if (isNode(pn,"createarray")) {
-	    //System.out.println(pn.PPrint(3,true));
-	    TypeDescriptor td=parseTypeDescriptor(pn);
-	    Vector args=parseDimExprs(pn);
-	    int num=0;
-	    if (pn.getChild("dims_opt").getLiteral()!=null)
-		num=((Integer)pn.getChild("dims_opt").getLiteral()).intValue();
-	    for(int i=0;i<(args.size()+num);i++)
-		td=td.makeArray(state);
-	    CreateObjectNode con=new CreateObjectNode(td);
-	    for(int i=0;i<args.size();i++) {
-		con.addArgument((ExpressionNode)args.get(i));
-	    }
-	    return con;
-	} else if (isNode(pn,"name")) {
-	    NameDescriptor nd=parseName(pn);
-	    return new NameNode(nd);
-	} else if (isNode(pn,"this")) {
-	    NameDescriptor nd=new NameDescriptor("this");
-	    return new NameNode(nd);
-	} else if (isNode(pn,"methodinvoke1")) {
-	    NameDescriptor nd=parseName(pn.getChild("name"));
-	    Vector args=parseArgumentList(pn);
-	    MethodInvokeNode min=new MethodInvokeNode(nd);
-	    for(int i=0;i<args.size();i++) {
-		min.addArgument((ExpressionNode)args.get(i));
-	    }
-	    return min;
-	} else if (isNode(pn,"methodinvoke2")) {
-	    String methodid=pn.getChild("id").getTerminal();
-	    ExpressionNode exp=parseExpression(pn.getChild("base").getFirstChild());
-	    Vector args=parseArgumentList(pn);
-	    MethodInvokeNode min=new MethodInvokeNode(methodid,exp);
-	    for(int i=0;i<args.size();i++) {
-		min.addArgument((ExpressionNode)args.get(i));
-	    }
-	    return min;
-	} else if (isNode(pn,"fieldaccess")) { 
-	    ExpressionNode en=parseExpression(pn.getChild("base").getFirstChild());	    String fieldname=pn.getChild("field").getTerminal();
-	    return new FieldAccessNode(en,fieldname);
-	} else if (isNode(pn,"arrayaccess")) { 
-	    ExpressionNode en=parseExpression(pn.getChild("base").getFirstChild());
-	    ExpressionNode index=parseExpression(pn.getChild("index").getFirstChild());
-	    return new ArrayAccessNode(en,index);
-	} else if (isNode(pn,"cast1")) { 
-	    return new CastNode(parseTypeDescriptor(pn.getChild("type")),parseExpression(pn.getChild("exp").getFirstChild()));
-	} else if (isNode(pn,"cast2")) { 
-	    return new CastNode(parseExpression(pn.getChild("type").getFirstChild()),parseExpression(pn.getChild("exp").getFirstChild()));
-	} else {
-	    System.out.println("---------------------");
-	    System.out.println(pn.PPrint(3,true));
-	    throw new Error();
-	}
+  private Vector parseDimExprs(ParseNode pn) {
+    Vector arglist=new Vector();
+    ParseNode an=pn.getChild("dim_exprs");
+    if (an==null)       /* No argument list */
+      return arglist;
+    ParseNodeVector anv=an.getChildren();
+    for(int i=0; i<anv.size(); i++) {
+      arglist.add(parseExpression(anv.elementAt(i)));
     }
+    return arglist;
+  }
 
-    private Vector parseDimExprs(ParseNode pn) {
-	Vector arglist=new Vector();
-	ParseNode an=pn.getChild("dim_exprs");
-	if (an==null)   /* No argument list */
-	    return arglist;
-	ParseNodeVector anv=an.getChildren();
-	for(int i=0;i<anv.size();i++) {
-	    arglist.add(parseExpression(anv.elementAt(i)));
-	}
-	return arglist;
+  private Vector parseArgumentList(ParseNode pn) {
+    Vector arglist=new Vector();
+    ParseNode an=pn.getChild("argument_list");
+    if (an==null)       /* No argument list */
+      return arglist;
+    ParseNodeVector anv=an.getChildren();
+    for(int i=0; i<anv.size(); i++) {
+      arglist.add(parseExpression(anv.elementAt(i)));
     }
+    return arglist;
+  }
 
-    private Vector parseArgumentList(ParseNode pn) {
-	Vector arglist=new Vector();
-	ParseNode an=pn.getChild("argument_list");
-	if (an==null)   /* No argument list */
-	    return arglist;
-	ParseNodeVector anv=an.getChildren();
-	for(int i=0;i<anv.size();i++) {
-	    arglist.add(parseExpression(anv.elementAt(i)));
-	}
-	return arglist;
-    }
-
-    private Vector[] parseConsArgumentList(ParseNode pn) {
-	Vector arglist=new Vector();
-	Vector varlist=new Vector();
-	ParseNode an=pn.getChild("cons_argument_list");
-	if (an==null)   /* No argument list */
-	    return new Vector[] {varlist, arglist};
-	ParseNodeVector anv=an.getChildren();
-	for(int i=0;i<anv.size();i++) {
-	    ParseNode cpn=anv.elementAt(i);
-	    ParseNode var=cpn.getChild("var");
-	    ParseNode exp=cpn.getChild("exp").getFirstChild();
-	    varlist.add(var.getTerminal());
-	    arglist.add(parseExpression(exp));
-	}
-	return new Vector[] {varlist, arglist};
+  private Vector[] parseConsArgumentList(ParseNode pn) {
+    Vector arglist=new Vector();
+    Vector varlist=new Vector();
+    ParseNode an=pn.getChild("cons_argument_list");
+    if (an==null)       /* No argument list */
+      return new Vector[] {varlist, arglist};
+    ParseNodeVector anv=an.getChildren();
+    for(int i=0; i<anv.size(); i++) {
+      ParseNode cpn=anv.elementAt(i);
+      ParseNode var=cpn.getChild("var");
+      ParseNode exp=cpn.getChild("exp").getFirstChild();
+      varlist.add(var.getTerminal());
+      arglist.add(parseExpression(exp));
     }
+    return new Vector[] {varlist, arglist};
+  }
 
-    private ExpressionNode parseAssignmentExpression(ParseNode pn) {
-	AssignOperation ao=new AssignOperation(pn.getChild("op").getTerminal());
-	ParseNodeVector pnv=pn.getChild("args").getChildren();
-	
-	AssignmentNode an=new AssignmentNode(parseExpression(pnv.elementAt(0)),parseExpression(pnv.elementAt(1)),ao);
-	return an;
+  private Vector parseVariableInitializerList(ParseNode pn) {
+    Vector varInitList=new Vector();
+    ParseNode vin=pn.getChild("var_init_list");
+    if (vin==null)       /* No argument list */
+      return varInitList;
+    ParseNodeVector vinv=vin.getChildren();
+    for(int i=0; i<vinv.size(); i++) {
+      varInitList.add(parseExpression(vinv.elementAt(i)));
     }
+    return varInitList;
+  }
+
+  private ExpressionNode parseAssignmentExpression(ParseNode pn) {
+    AssignOperation ao=new AssignOperation(pn.getChild("op").getTerminal());
+    ParseNodeVector pnv=pn.getChild("args").getChildren();
 
+    AssignmentNode an=new AssignmentNode(parseExpression(pnv.elementAt(0)),parseExpression(pnv.elementAt(1)),ao);
+    an.setNumLine(pn.getLine());
+    return an;
+  }
 
-    private void parseMethodDecl(ClassDescriptor cn, ParseNode pn) {
-	ParseNode headern=pn.getChild("method_header");
-	ParseNode bodyn=pn.getChild("body");
-	MethodDescriptor md=parseMethodHeader(headern);
-	BlockNode bn=parseBlock(bodyn);
-	cn.addMethod(md);
-	state.addTreeCode(md,bn);
+
+  private void parseMethodDecl(ClassDescriptor cn, ParseNode pn) {
+    ParseNode headern=pn.getChild("method_header");
+    ParseNode bodyn=pn.getChild("body");
+    MethodDescriptor md=parseMethodHeader(headern);
+    try {
+      BlockNode bn=parseBlock(bodyn);
+      bn.setNumLine(pn.getLine()); // assume that method header is located at the beginning of method body
+      cn.addMethod(md);
+      state.addTreeCode(md,bn);
+
+      // this is a hack for investigating new language features
+      // at the AST level, someday should evolve into a nice compiler
+      // option *wink*
+      //if( cn.getSymbol().equals( ***put a class in here like:     "Test" ) &&
+      //    md.getSymbol().equals( ***put your method in here like: "main" ) 
+      //) {
+      //  bn.setStyle( BlockNode.NORMAL );
+      //  System.out.println( bn.printNode( 0 ) );
+      //}
+
+    } catch (Exception e) {
+      System.out.println("Error with method:"+md.getSymbol());
+      e.printStackTrace();
+      throw new Error();
+    } catch (Error e) {
+      System.out.println("Error with method:"+md.getSymbol());
+      e.printStackTrace();
+      throw new Error();
     }
+  }
 
-    private void parseConstructorDecl(ClassDescriptor cn, ParseNode pn) {
-	ParseNode mn=pn.getChild("modifiers");
-	Modifiers m=parseModifiersList(mn);
-	ParseNode cdecl=pn.getChild("constructor_declarator");
-	String name=cdecl.getChild("name").getChild("identifier").getTerminal();
-	MethodDescriptor md=new MethodDescriptor(m, name);
-	ParseNode paramnode=cdecl.getChild("parameters");
-	parseParameterList(md,paramnode);
-	ParseNode bodyn0=pn.getChild("body");
-	ParseNode bodyn=bodyn0.getChild("constructor_body");
-	cn.addMethod(md);
-	BlockNode bn=parseBlock(bodyn);
-	state.addTreeCode(md,bn);
+  private void parseConstructorDecl(ClassDescriptor cn, ParseNode pn) {
+    ParseNode mn=pn.getChild("modifiers");
+    Modifiers m=parseModifiersList(mn);
+    ParseNode cdecl=pn.getChild("constructor_declarator");
+    boolean isglobal=cdecl.getChild("global")!=null;
+    String name=cdecl.getChild("name").getChild("identifier").getTerminal();
+    MethodDescriptor md=new MethodDescriptor(m, name, isglobal);
+    ParseNode paramnode=cdecl.getChild("parameters");
+    parseParameterList(md,paramnode);
+    ParseNode bodyn0=pn.getChild("body");
+    ParseNode bodyn=bodyn0.getChild("constructor_body");
+    cn.addMethod(md);
+    BlockNode bn=null;
+    if (bodyn!=null&&bodyn.getChild("block_statement_list")!=null)
+      bn=parseBlock(bodyn);
+    else
+      bn=new BlockNode();
+    if (bodyn!=null&&bodyn.getChild("superinvoke")!=null) {
+      ParseNode sin=bodyn.getChild("superinvoke");
+      NameDescriptor nd=new NameDescriptor("super");
+      Vector args=parseArgumentList(sin);
+      MethodInvokeNode min=new MethodInvokeNode(nd);
+      min.setNumLine(sin.getLine());
+      for(int i=0; i<args.size(); i++) {
+	min.addArgument((ExpressionNode)args.get(i));
+      }
+      BlockExpressionNode ben=new BlockExpressionNode(min);
+      bn.addFirstBlockStatement(ben);
+
+    } else if (bodyn!=null&&bodyn.getChild("explconstrinv")!=null) {
+      ParseNode eci=bodyn.getChild("explconstrinv");
+      NameDescriptor nd=new NameDescriptor(cn.getSymbol());
+      Vector args=parseArgumentList(eci);
+      MethodInvokeNode min=new MethodInvokeNode(nd);
+      min.setNumLine(eci.getLine());
+      for(int i=0; i<args.size(); i++) {
+	min.addArgument((ExpressionNode)args.get(i));
+      }
+      BlockExpressionNode ben=new BlockExpressionNode(min);
+      ben.setNumLine(eci.getLine());
+      bn.addFirstBlockStatement(ben);
+    }
+    state.addTreeCode(md,bn);
+  }
+  
+  private void parseStaticBlockDecl(ClassDescriptor cn, ParseNode pn) {
+    // Each class maintains one MethodDecscriptor which combines all its 
+    // static blocks in their declaration order
+    boolean isfirst = false;
+    MethodDescriptor md = (MethodDescriptor)cn.getMethodTable().getFromSameScope("staticblocks");
+    if(md == null) {
+      // the first static block for this class
+      Modifiers m_i=new Modifiers();
+      m_i.addModifier(Modifiers.STATIC);
+      md = new MethodDescriptor(m_i, "staticblocks", false);
+      md.setAsStaticBlock();
+      isfirst = true;
     }
+    ParseNode bodyn=pn.getChild("body");
+    if(isfirst) {
+      cn.addMethod(md);
+    }
+    cn.incStaticBlocks();
+    BlockNode bn=null;
+    if (bodyn!=null&&bodyn.getChild("block_statement_list")!=null)
+      bn=parseBlock(bodyn);
+    else
+      bn=new BlockNode();
+    if(isfirst) {
+      state.addTreeCode(md,bn);
+    } else {
+      BlockNode obn = state.getMethodBody(md);
+      for(int i = 0; i < bn.size(); i++) {
+        BlockStatementNode bsn = bn.get(i);
+        obn.addBlockStatement(bsn);
+      }
+      state.addTreeCode(md, obn);
+      bn = null;
+    }
+  }
+
+  public BlockNode parseBlock(ParseNode pn) {
+    this.m_taskexitnum = 0;
+    if (pn==null||isEmpty(pn.getTerminal()))
+      return new BlockNode();
+    ParseNode bsn=pn.getChild("block_statement_list");
+    return parseBlockHelper(bsn);
+  }
 
-    public BlockNode parseBlock(ParseNode pn) {
-	if (pn==null||isEmpty(pn.getTerminal()))
-	    return new BlockNode();
-	ParseNode bsn=pn.getChild("block_statement_list");
-	return parseBlockHelper(bsn);
+  private BlockNode parseBlockHelper(ParseNode pn) {
+    ParseNodeVector pnv=pn.getChildren();
+    BlockNode bn=new BlockNode();
+    for(int i=0; i<pnv.size(); i++) {
+      Vector bsv=parseBlockStatement(pnv.elementAt(i));
+      for(int j=0; j<bsv.size(); j++) {
+	bn.addBlockStatement((BlockStatementNode)bsv.get(j));
+      }
     }
-    
-    private BlockNode parseBlockHelper(ParseNode pn) {
-	ParseNodeVector pnv=pn.getChildren();
-	BlockNode bn=new BlockNode();
-	for(int i=0;i<pnv.size();i++) {
-	    Vector bsv=parseBlockStatement(pnv.elementAt(i));
-	    for(int j=0;j<bsv.size();j++) {
-		bn.addBlockStatement((BlockStatementNode)bsv.get(j));
-	    }
-	}
-	return bn;
+    return bn;
+  }
+
+  public BlockNode parseSingleBlock(ParseNode pn) {
+    BlockNode bn=new BlockNode();
+    Vector bsv=parseBlockStatement(pn);
+    for(int j=0; j<bsv.size(); j++) {
+      bn.addBlockStatement((BlockStatementNode)bsv.get(j));
     }
+    bn.setStyle(BlockNode.NOBRACES);
+    return bn;
+  }
 
-    public BlockNode parseSingleBlock(ParseNode pn) {
-	BlockNode bn=new BlockNode();
-	Vector bsv=parseBlockStatement(pn);
-	for(int j=0;j<bsv.size();j++) {
-	    bn.addBlockStatement((BlockStatementNode)bsv.get(j));
-	}
-	bn.setStyle(BlockNode.NOBRACES);
-	return bn;
+  public Vector parseSESEBlock(Vector parentbs, ParseNode pn) {
+    ParseNodeVector pnv=pn.getChildren();
+    Vector bv=new Vector();
+    for(int i=0; i<pnv.size(); i++) {
+      bv.addAll(parseBlockStatement(pnv.elementAt(i)));
     }
+    return bv;
+  }
 
-    public Vector parseBlockStatement(ParseNode pn) {
-	Vector blockstatements=new Vector();
-	if (isNode(pn,"local_variable_declaration")) {
-	    TypeDescriptor t=parseTypeDescriptor(pn);
-	    ParseNode vn=pn.getChild("variable_declarators_list");
-	    ParseNodeVector pnv=vn.getChildren();
-	    for(int i=0;i<pnv.size();i++) {
-		ParseNode vardecl=pnv.elementAt(i);
+  public Vector parseBlockStatement(ParseNode pn) {
+    Vector blockstatements=new Vector();
+    if (isNode(pn,"tag_declaration")) {
+      String name=pn.getChild("single").getTerminal();
+      String type=pn.getChild("type").getTerminal();
 
-	    
-		ParseNode tmp=vardecl;
-		TypeDescriptor arrayt=t;
-		while (tmp.getChild("single")==null) {
-		    arrayt=arrayt.makeArray(state);
-		    tmp=tmp.getChild("array");
-		}
-		String identifier=tmp.getChild("single").getTerminal();
-		
-		ParseNode epn=vardecl.getChild("initializer");
-	    
+      TagDeclarationNode tdn=new TagDeclarationNode(name, type);
+      tdn.setNumLine(pn.getLine());
+      
+      blockstatements.add(tdn);
+    } else if (isNode(pn,"local_variable_declaration")) {
+      
+      ParseNode mn=pn.getChild("modifiers");         
+      TypeDescriptor t=parseTypeDescriptor(pn);
+      if(mn!=null){
+        Modifiers m=parseModifiersList(mn);
+        assignAnnotationsToType(m, t);        
+      }   
+      ParseNode vn=pn.getChild("variable_declarators_list");
+      ParseNodeVector pnv=vn.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+	ParseNode vardecl=pnv.elementAt(i);
 
-		ExpressionNode en=null;
-		if (epn!=null)
-		    en=parseExpression(epn.getFirstChild());
-		
-		blockstatements.add(new DeclarationNode(new VarDescriptor(arrayt, identifier),en));
-	    }
-	} else if (isNode(pn,"nop")) {
-	    /* Do Nothing */
-	} else if (isNode(pn,"expression")) {
-	    blockstatements.add(new BlockExpressionNode(parseExpression(pn.getFirstChild())));
-	} else if (isNode(pn,"ifstatement")) {
-	    blockstatements.add(new IfStatementNode(parseExpression(pn.getChild("condition").getFirstChild()),
-				       parseSingleBlock(pn.getChild("statement").getFirstChild()),
-				       pn.getChild("else_statement")!=null?parseSingleBlock(pn.getChild("else_statement").getFirstChild()):null));
-	} else if (isNode(pn,"taskexit")) {
-	    Vector vfe=null;
-	    if (pn.getChild("flag_effects_list")!=null)
-		vfe=parseFlags(pn.getChild("flag_effects_list"));
-	    Vector ccs=null;
-	    if (pn.getChild("cons_checks")!=null)
-		ccs=parseChecks(pn.getChild("cons_checks"));
-	    
-	    blockstatements.add(new TaskExitNode(vfe, ccs));
-	} else if (isNode(pn,"return")) {
-	    if (isEmpty(pn.getTerminal()))
-		blockstatements.add(new ReturnNode());
-	    else {
-		ExpressionNode en=parseExpression(pn.getFirstChild());
-		blockstatements.add(new ReturnNode(en));
-	    }
-	} else if (isNode(pn,"block_statement_list")) {
-	    BlockNode bn=parseBlockHelper(pn);
-	    blockstatements.add(new SubBlockNode(bn));
-	} else if (isNode(pn,"empty")) {
-	    /* nop */
-	} else if (isNode(pn,"statement_expression_list")) {
-	    ParseNodeVector pnv=pn.getChildren();
-	    BlockNode bn=new BlockNode();
-	    for(int i=0;i<pnv.size();i++) {
-		ExpressionNode en=parseExpression(pnv.elementAt(i));
-		blockstatements.add(new BlockExpressionNode(en));
-	    }
-	    bn.setStyle(BlockNode.EXPRLIST);
-	} else if (isNode(pn,"forstatement")) {
-	    BlockNode init=parseSingleBlock(pn.getChild("initializer").getFirstChild());
-	    BlockNode update=parseSingleBlock(pn.getChild("update").getFirstChild());
-	    ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
-	    BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
-	    blockstatements.add(new LoopNode(init,condition,update,body));
-	} else if (isNode(pn,"whilestatement")) {
-	    ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
-	    BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
-	    blockstatements.add(new LoopNode(condition,body,LoopNode.WHILELOOP));
-	} else if (isNode(pn,"dowhilestatement")) {
-	    ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
-	    BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
-	    blockstatements.add(new LoopNode(condition,body,LoopNode.DOWHILELOOP));
-   	} else {
-	    System.out.println("---------------");
-	    System.out.println(pn.PPrint(3,true));
-	    throw new Error();
+
+	ParseNode tmp=vardecl;
+	TypeDescriptor arrayt=t;
+
+	while (tmp.getChild("single")==null) {
+	  arrayt=arrayt.makeArray(state);
+	  tmp=tmp.getChild("array");
 	}
-	return blockstatements;
-    }
+	String identifier=tmp.getChild("single").getTerminal();
+
+	ParseNode epn=vardecl.getChild("initializer");
+
 
-    public MethodDescriptor parseMethodHeader(ParseNode pn) {
-	ParseNode mn=pn.getChild("modifiers");
-	Modifiers m=parseModifiersList(mn);
+	ExpressionNode en=null;
+	if (epn!=null)
+	  en=parseExpression(epn.getFirstChild());
 	
-	ParseNode tn=pn.getChild("returntype");
-	TypeDescriptor returntype;
-	if (tn!=null) 
-	    returntype=parseTypeDescriptor(tn);
-	else
-	    returntype=new TypeDescriptor(TypeDescriptor.VOID);
-
-	ParseNode pmd=pn.getChild("method_declarator");
-	String name=pmd.getChild("name").getTerminal();
-	MethodDescriptor md=new MethodDescriptor(m, returntype, name);
-       
-	ParseNode paramnode=pmd.getChild("parameters");
-	parseParameterList(md,paramnode);
-	return md;
-    }
-
-    public void parseParameterList(MethodDescriptor md, ParseNode pn) {
-	ParseNode paramlist=pn.getChild("formal_parameter_list");
-	if (paramlist==null)
-	    return;
-	 ParseNodeVector pnv=paramlist.getChildren();
-	 for(int i=0;i<pnv.size();i++) {
-	     ParseNode paramn=pnv.elementAt(i);
-	     TypeDescriptor type=parseTypeDescriptor(paramn);
-
-	     ParseNode tmp=paramn;
-	     while (tmp.getChild("single")==null) {
-		 type=type.makeArray(state);
-		 tmp=tmp.getChild("array");
-	     }
-	     String paramname=tmp.getChild("single").getTerminal();
-	    
-	     md.addParameter(type,paramname);
-	 }
-    }
-
-    public Modifiers parseModifiersList(ParseNode pn) {
-	Modifiers m=new Modifiers();
-	ParseNode modlist=pn.getChild("modifier_list");
-	if (modlist!=null) {
-	    ParseNodeVector pnv=modlist.getChildren();
-	    for(int i=0;i<pnv.size();i++) {
-		ParseNode modn=pnv.elementAt(i);
-		if (isNode(modn,"public"))
-		    m.addModifier(Modifiers.PUBLIC);
-		if (isNode(modn,"protected"))
-		    m.addModifier(Modifiers.PROTECTED);
-		if (isNode(modn,"private"))
-		    m.addModifier(Modifiers.PRIVATE);
-		if (isNode(modn,"static"))
-		    m.addModifier(Modifiers.STATIC);
-		if (isNode(modn,"final"))
-		    m.addModifier(Modifiers.FINAL);
-		if (isNode(modn,"native"))
-		    m.addModifier(Modifiers.NATIVE);
-	    }
-	}
-	return m;
-    }
+	DeclarationNode dn=new DeclarationNode(new VarDescriptor(arrayt, identifier),en);
+	dn.setNumLine(tmp.getLine());
 
-    private boolean isNode(ParseNode pn, String label) {
-	if (pn.getLabel().equals(label))
-	    return true;
-	else return false;
-    }
+	blockstatements.add(dn);
+      }
+    } else if (isNode(pn,"nop")) {
+      /* Do Nothing */
+    } else if (isNode(pn,"expression")) {
+      BlockExpressionNode ben=new BlockExpressionNode(parseExpression(pn.getFirstChild()));
+      ben.setNumLine(pn.getLine());
+      blockstatements.add(ben);
+    } else if (isNode(pn,"ifstatement")) {
+      IfStatementNode isn=new IfStatementNode(parseExpression(pn.getChild("condition").getFirstChild()),
+          parseSingleBlock(pn.getChild("statement").getFirstChild()),
+          pn.getChild("else_statement")!=null ? parseSingleBlock(pn.getChild("else_statement").getFirstChild()) : null);
+      isn.setNumLine(pn.getLine());
+      
+      blockstatements.add(isn);
+    } else if (isNode(pn,"switch_statement")) {
+      // TODO add version for normal Java later
+      SwitchStatementNode ssn=new SwitchStatementNode(parseExpression(pn.getChild("condition").getFirstChild()),
+          parseSingleBlock(pn.getChild("statement").getFirstChild()));
+      ssn.setNumLine(pn.getLine());
+      blockstatements.add(ssn);
+    } else if (isNode(pn,"switch_block_list")) {
+      // TODO add version for normal Java later
+      ParseNodeVector pnv=pn.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+        ParseNode sblockdecl=pnv.elementAt(i);
+        
+        if(isNode(sblockdecl, "switch_block")) {
+          ParseNode lpn=sblockdecl.getChild("switch_labels").getChild("switch_label_list");
+          ParseNodeVector labelv=lpn.getChildren();
+          Vector<SwitchLabelNode> slv = new Vector<SwitchLabelNode>();
+          for(int j=0; j<labelv.size(); j++) {
+            ParseNode labeldecl=labelv.elementAt(j);
+            if(isNode(labeldecl, "switch_label")) {
+              SwitchLabelNode sln=new SwitchLabelNode(parseExpression(labeldecl.getChild("constant_expression").getFirstChild()), false);
+              sln.setNumLine(labeldecl.getLine());
+              slv.addElement(sln);
+            } else if(isNode(labeldecl, "default_switch_label")) {
+              SwitchLabelNode sln=new SwitchLabelNode(null, true);
+              sln.setNumLine(labeldecl.getLine());
+              slv.addElement(sln);
+            }
+          }
+          
+          SwitchBlockNode sbn=new SwitchBlockNode(slv, 
+              parseSingleBlock(sblockdecl.getChild("switch_statements").getFirstChild()));
+          sbn.setNumLine(sblockdecl.getLine());
+          
+          blockstatements.add(sbn);
+          
+        }
+      }
+    } else if (isNode(pn, "trycatchstatement")) {
+      // TODO add version for normal Java later
+      // Do not fully support exceptions now. Only make sure that if there are no
+      // exceptions thrown, the execution is right
+      ParseNode tpn = pn.getChild("tryblock").getFirstChild();
+      BlockNode bn=parseBlockHelper(tpn);
+      blockstatements.add(new SubBlockNode(bn));
+      
+      ParseNode fbk = pn.getChild("finallyblock");
+      if(fbk != null) {
+        ParseNode fpn = fbk.getFirstChild();
+        BlockNode fbn=parseBlockHelper(fpn);
+        blockstatements.add(new SubBlockNode(fbn));
+      }
+    } else if (isNode(pn, "throwstatement")) {
+      // TODO Simply return here
+      //blockstatements.add(new ReturnNode());
+    } else if (isNode(pn,"taskexit")) {
+      Vector vfe=null;
+      if (pn.getChild("flag_effects_list")!=null)
+	vfe=parseFlags(pn.getChild("flag_effects_list"));
+      Vector ccs=null;
+      if (pn.getChild("cons_checks")!=null)
+	ccs=parseChecks(pn.getChild("cons_checks"));
+      TaskExitNode ten=new TaskExitNode(vfe, ccs, this.m_taskexitnum++);
+      ten.setNumLine(pn.getLine());
+      blockstatements.add(ten);
+    } else if (isNode(pn,"atomic")) {
+      BlockNode bn=parseBlockHelper(pn);
+      AtomicNode an=new AtomicNode(bn);
+      an.setNumLine(pn.getLine());
+      blockstatements.add(an);
+    } else if (isNode(pn,"synchronized")) {
+      BlockNode bn=parseBlockHelper(pn.getChild("block"));
+      ExpressionNode en=parseExpression(pn.getChild("expr").getFirstChild());
+      SynchronizedNode sn=new SynchronizedNode(en, bn);
+      sn.setNumLine(pn.getLine());
+      blockstatements.add(sn);
+    } else if (isNode(pn,"return")) {
+      if (isEmpty(pn.getTerminal()))
+	blockstatements.add(new ReturnNode());
+      else {
+	ExpressionNode en=parseExpression(pn.getFirstChild());
+	ReturnNode rn=new ReturnNode(en);
+	rn.setNumLine(pn.getLine());
+	blockstatements.add(rn);
+      }
+    } else if (isNode(pn,"block_statement_list")) {
+      BlockNode bn=parseBlockHelper(pn);
+      blockstatements.add(new SubBlockNode(bn));
+    } else if (isNode(pn,"empty")) {
+      /* nop */
+    } else if (isNode(pn,"statement_expression_list")) {
+      ParseNodeVector pnv=pn.getChildren();
+      BlockNode bn=new BlockNode();
+      for(int i=0; i<pnv.size(); i++) {
+	ExpressionNode en=parseExpression(pnv.elementAt(i));
+	blockstatements.add(new BlockExpressionNode(en));
+      }
+      bn.setStyle(BlockNode.EXPRLIST);
+    } else if (isNode(pn,"forstatement")) {
+      BlockNode init=parseSingleBlock(pn.getChild("initializer").getFirstChild());
+      BlockNode update=parseSingleBlock(pn.getChild("update").getFirstChild());
+      ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
+      BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
+      if(condition == null) {
+        // no condition clause, make a 'true' expression as the condition
+        condition = (ExpressionNode)new LiteralNode("boolean", new Boolean(true));
+      }
+      LoopNode ln=new LoopNode(init,condition,update,body);
+      ln.setNumLine(pn.getLine());
+      blockstatements.add(ln);
+    } else if (isNode(pn,"whilestatement")) {
+      ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
+      BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
+      if(condition == null) {
+        // no condition clause, make a 'true' expression as the condition
+        condition = (ExpressionNode)new LiteralNode("boolean", new Boolean(true));
+      }
+      blockstatements.add(new LoopNode(condition,body,LoopNode.WHILELOOP));
+    } else if (isNode(pn,"dowhilestatement")) {
+      ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
+      BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
+      if(condition == null) {
+        // no condition clause, make a 'true' expression as the condition
+        condition = (ExpressionNode)new LiteralNode("boolean", new Boolean(true));
+      }
+      blockstatements.add(new LoopNode(condition,body,LoopNode.DOWHILELOOP));
+    } else if (isNode(pn,"sese")) {
+      ParseNode pnID=pn.getChild("identifier");
+      String stID=null;
+      if( pnID != null ) { stID=pnID.getFirstChild().getTerminal(); }
+      SESENode start=new SESENode(stID);
+      start.setNumLine(pn.getLine());
+      SESENode end  =new SESENode(stID);
+      start.setEnd( end   );
+      end.setStart( start );
+      blockstatements.add(start);
+      blockstatements.addAll(parseSESEBlock(blockstatements,pn.getChild("body").getFirstChild()));
+      blockstatements.add(end);
+    } else if (isNode(pn,"continue")) {
+      ContinueBreakNode cbn=new ContinueBreakNode(false);
+      cbn.setNumLine(pn.getLine());
+      blockstatements.add(cbn);
+    } else if (isNode(pn,"break")) {
+      ContinueBreakNode cbn=new ContinueBreakNode(true);
+      cbn.setNumLine(pn.getLine());
+      blockstatements.add(cbn);
 
-    private static boolean isEmpty(ParseNode pn) {
-	if (pn.getLabel().equals("empty"))
-	    return true;
-	else
-	    return false;
+    } else if (isNode(pn,"genreach")) {
+      String graphName = pn.getChild("graphName").getTerminal();
+      blockstatements.add( new GenReachNode( graphName ) );
+
+    } else {
+      System.out.println("---------------");
+      System.out.println(pn.PPrint(3,true));
+      throw new Error();
     }
+    return blockstatements;
+  }
 
-    private static boolean isEmpty(String s) {
-	if (s.equals("empty"))
-	    return true;
-	else
-	    return false;
+  public MethodDescriptor parseMethodHeader(ParseNode pn) {
+    ParseNode mn=pn.getChild("modifiers");
+    Modifiers m=parseModifiersList(mn);
+
+    ParseNode tn=pn.getChild("returntype");
+    TypeDescriptor returntype;
+    if (tn!=null)
+      returntype=parseTypeDescriptor(tn);
+    else
+      returntype=new TypeDescriptor(TypeDescriptor.VOID);
+
+    ParseNode pmd=pn.getChild("method_declarator");
+    String name=pmd.getChild("name").getTerminal();
+    MethodDescriptor md=new MethodDescriptor(m, returntype, name);
+
+    ParseNode paramnode=pmd.getChild("parameters");
+    parseParameterList(md,paramnode);
+    return md;
+  }
+
+  public void parseParameterList(MethodDescriptor md, ParseNode pn) {
+    ParseNode paramlist=pn.getChild("formal_parameter_list");
+    if (paramlist==null)
+      return;
+    ParseNodeVector pnv=paramlist.getChildren();
+    for(int i=0; i<pnv.size(); i++) {
+      ParseNode paramn=pnv.elementAt(i);
+
+      if (isNode(paramn, "tag_parameter")) {
+	String paramname=paramn.getChild("single").getTerminal();
+	TypeDescriptor type=new TypeDescriptor(TypeDescriptor.TAG);
+	md.addTagParameter(type, paramname);
+      } else  {
+        
+	TypeDescriptor type=parseTypeDescriptor(paramn);
+
+	ParseNode tmp=paramn;
+	while (tmp.getChild("single")==null) {
+	  type=type.makeArray(state);
+	  tmp=tmp.getChild("array");
+	}
+	String paramname=tmp.getChild("single").getTerminal();
+
+	md.addParameter(type, paramname);
+  if(isNode(paramn, "annotation_parameter")){
+    ParseNode bodynode=paramn.getChild("annotation_body");
+    parseParameterAnnotation(bodynode,type);
+  }
+  
+      }
     }
+  }
 
-    /** Throw an exception if something is unexpected */
-    private void check(ParseNode pn, String label) {
-        if (pn == null) {
-            throw new Error(pn+ "IE: Expected '" + label + "', got null");
-        }
-        if (! pn.getLabel().equals(label)) {
-            throw new Error(pn+ "IE: Expected '" + label + "', got '"+pn.getLabel()+"'");
+  public Modifiers parseModifiersList(ParseNode pn) {
+    Modifiers m=new Modifiers();
+    ParseNode modlist=pn.getChild("modifier_list");
+    if (modlist!=null) {
+      ParseNodeVector pnv=modlist.getChildren();
+      for(int i=0; i<pnv.size(); i++) {
+	ParseNode modn=pnv.elementAt(i);	
+	if (isNode(modn,"public"))
+	  m.addModifier(Modifiers.PUBLIC);
+	else if (isNode(modn,"protected"))
+	  m.addModifier(Modifiers.PROTECTED);
+	else if (isNode(modn,"private"))
+	  m.addModifier(Modifiers.PRIVATE);
+	else if (isNode(modn,"static"))
+	  m.addModifier(Modifiers.STATIC);
+	else if (isNode(modn,"final"))
+	  m.addModifier(Modifiers.FINAL);
+	else if (isNode(modn,"native"))
+	  m.addModifier(Modifiers.NATIVE);
+	else if (isNode(modn,"synchronized"))
+	  m.addModifier(Modifiers.SYNCHRONIZED);
+	else if (isNode(modn,"atomic"))
+	  m.addModifier(Modifiers.ATOMIC);
+    else if (isNode(modn,"abstract"))
+      m.addModifier(Modifiers.ABSTRACT);
+    else if (isNode(modn,"volatile"))
+      m.addModifier(Modifiers.VOLATILE);
+    else if (isNode(modn,"transient"))
+      m.addModifier(Modifiers.TRANSIENT);
+    else if(isNode(modn,"annotation_list"))
+      parseAnnotationList(modn,m);    
+	else{	  
+	  throw new Error("Unrecognized Modifier:"+modn.getLabel());}
+      }
+    }
+    return m;
+  }
+  
+  private void parseAnnotationList(ParseNode pn, Modifiers m) {
+    ParseNodeVector pnv = pn.getChildren();
+    for (int i = 0; i < pnv.size(); i++) {
+      ParseNode body_list = pnv.elementAt(i);
+      if (isNode(body_list, "annotation_body")) {
+        ParseNode body_node = body_list.getFirstChild();
+        if (isNode(body_node, "marker_annotation")) {
+          m.addAnnotation(new AnnotationDescriptor(body_node.getChild("name").getTerminal()));
+        } else if (isNode(body_node, "single_annotation")) {
+          m.addAnnotation(new AnnotationDescriptor(body_node.getChild("name").getTerminal(),
+              body_node.getChild("element_value").getTerminal()));
+        } else if (isNode(body_node, "normal_annotation")) {
+          throw new Error("Annotation with multiple data members is not supported yet.");
         }
+      }
+    }
+  }
+  
+  private void parseParameterAnnotation(ParseNode body_list,TypeDescriptor type){
+    ParseNode body_node = body_list.getFirstChild();
+    if (isNode(body_node, "marker_annotation")) {
+      type.addAnnotationMarker(new AnnotationDescriptor(body_node.getChild("name").getTerminal()));
+    } else if (isNode(body_node, "single_annotation")) {
+      type.addAnnotationMarker(new AnnotationDescriptor(body_node.getChild("name").getTerminal(),
+          body_node.getChild("element_value").getTerminal()));
+    } else if (isNode(body_node, "normal_annotation")) {
+      throw new Error("Annotation with multiple data members is not supported yet.");
+    }
+  }
+  
+  private boolean isNode(ParseNode pn, String label) {
+    if (pn.getLabel().equals(label))
+      return true;
+    else return false;
+  }
+
+  private static boolean isEmpty(ParseNode pn) {
+    if (pn.getLabel().equals("empty"))
+      return true;
+    else
+      return false;
+  }
+
+  private static boolean isEmpty(String s) {
+    if (s.equals("empty"))
+      return true;
+    else
+      return false;
+  }
+
+  /** Throw an exception if something is unexpected */
+  private void check(ParseNode pn, String label) {
+    if (pn == null) {
+      throw new Error(pn+ "IE: Expected '" + label + "', got null");
+    }
+    if (!pn.getLabel().equals(label)) {
+      throw new Error(pn+ "IE: Expected '" + label + "', got '"+pn.getLabel()+"'");
     }
+  }
 }