improved Sage, fixed dedlock

dvm/fdvm/trunk/Sage/lib/include/libSage++.h

@@ -243,9 +243,9 @@ public:
     inline void replaceSymbBySymb(SgSymbol &symb, SgSymbol &newsymb);
     inline void replaceSymbBySymbSameName(SgSymbol &symb, SgSymbol &newsymb);
     inline void replaceTypeInStmt(SgType &old, SgType &newtype);
-    char* unparse(int lang = 2); // FORTRAN_LANG
+    char* unparse(int lang = 0); // FORTRAN_LANG
     inline void unparsestdout();
-    std::string sunparse(int lang = 2); // FORTRAN_LANG
+    std::string sunparse(int lang = 0); // FORTRAN_LANG
     inline char *comments();      //preceding comment lines.
     void addComment(const char *com);
     void addComment(char *com);
@@ -3684,7 +3684,7 @@ inline char* SgStatement::unparse(int lang)
 #ifdef __SPF
     checkConsistence();
 #endif
-	return UnparseBif_Char(thebif, lang); //2 - fortran language 
+	return UnparseBif_Char(thebif, lang); //0 - fortran language 
 }
 
 inline void SgStatement::unparsestdout()

dvm/fdvm/trunk/parser/ftn.gram

@@ -404,6 +404,7 @@ void startioctl();
 void endioctl();
 void redefine_func_arg_type();
 int isResultVar();
+int yylex();
 
 /* used by FORTRAN M */
 PTR_BFND make_processdo();

dvm/fdvm/trunk/parser/gram1.y

@@ -756,6 +756,7 @@ void startioctl();
 void endioctl();
 void redefine_func_arg_type();
 int isResultVar();
+int yylex();
 
 /* used by FORTRAN M */
 PTR_BFND make_processdo();