Changeset 825

Timestamp:

Aug 3, 2012 3:42:26 PM (12 years ago)

Author:

biz002

Message:

new option for run-pretty-magnolia test function

Location:

trunk/magnolia-eclipse/src/org/magnolialang

Files:

• pgf/tests/TestPrettyMagnolia.rsc (modified) (11 diffs)
• testutil/core.clj (modified) (2 diffs)

trunk/magnolia-eclipse/src/org/magnolialang/pgf/tests/TestPrettyMagnolia.rsc

@@ -23 +23 @@
 (rimport "org::magnolialang::pgf::tests::TestPrettyMagnolia")
 
-(run-pretty-magnolia "basic.Basic")
-(run-pretty-magnolia "basic.Integer")
-(run-pretty-magnolia "errors.ConstantOverloading")
-(run-pretty-magnolia "mutification.Integer")
-(run-pretty-magnolia "mutification.Mutification")
-(run-pretty-magnolia "mutification.Mutification2")
-(run-pretty-magnolia "override.Override")
-(run-pretty-magnolia "scoping.Scoping")
-(run-pretty-magnolia "toplevel.Operators")
-(run-pretty-magnolia "toplevel.Parens")
-(run-pretty-magnolia "toplevel.Predicates")
-(run-pretty-magnolia "toplevel.Renaming")
-(run-pretty-magnolia "typecheck.OnDefines")
-(run-pretty-magnolia "typecheck.Requires")
-(run-pretty-magnolia "typecheck.TypeDecl")
+(run-pretty-magnolia "basic.Basic" false)
+(run-pretty-magnolia "basic.Integer" false)
+(run-pretty-magnolia "errors.ConstantOverloading" false)
+(run-pretty-magnolia "mutification.Integer" false)
+(run-pretty-magnolia "mutification.Mutification" false)
+(run-pretty-magnolia "mutification.Mutification2" false)
+(run-pretty-magnolia "override.Override" false)
+(run-pretty-magnolia "scoping.Scoping" false)
+(run-pretty-magnolia "toplevel.Operators" false)
+(run-pretty-magnolia "toplevel.Parens" false)
+(run-pretty-magnolia "toplevel.Predicates" false)
+(run-pretty-magnolia "toplevel.Renaming" false)
+(run-pretty-magnolia "typecheck.OnDefines" false)
+(run-pretty-magnolia "typecheck.Requires" false)
+(run-pretty-magnolia "typecheck.TypeDecl" false)
 
 */
 
-public void runPrettyMagnolia(str modName) {
+public void runPrettyMagnolia(str modName, bool isRich) {
   name = strToName(modName);
   tr = startTransaction();
@@ -50 +50 @@
   // But we want printing of both to work.
 
-  //AST tree = getFact(tr, #ImplodedTree, name).val;
-  AST tree = getFact(tr, #TypeChecked, name).val;
+  AST tree;
+  if (isRich)
+    tree = getFact(tr, #ImplodedTree, name).val;
+  else
+    tree = getFact(tr, #TypeChecked, name).val;
 
   endTransaction(tr);
@@ -166 +169 @@
 }
 
-//xxx
 Tseq pp(t : BinOpSugar(arg0, leaf(arg1), arg2), Tseq stream) {
   //println(typeOf(arg1)); // arg1 is of AST
@@ -488 +490 @@
 }
 
-//xxx
 Tseq pp(IndexSugar(arg0, arg1), Tseq stream) {
   return ast2stream(stream, pp, arg0, LBracket, SepBy(arg1, Comma), RBracket);
 }
 
-//xxx
 Tseq pp(InSugar(arg0, leaf(arg1), arg2), Tseq stream) {
   return ast2stream(stream, pp, arg0, BinOp(arg1), arg2);
@@ -570 +570 @@
 }
 
-// xxx
 Tseq ppProcParam(ParamSugar(n, tn), Tseq stream) {
   return ast2stream(stream, pp, n, Colon, basename(tn));
@@ -580 +579 @@
 }
 
-// a Param has name and type, maybe also modifier,
-// but modifiers are not suitable for function params
+// a Param has name and type, maybe also modifier (discarded)
 Tseq ppFunParam(Param(arg0, arg1, arg2), Tseq stream) {
   return ast2stream(stream, pp, arg1, Colon, basename(arg2));
@@ -606 +604 @@
 }
 
-//xxx
 Tseq pp(t : PreOpSugar(leaf(arg0), arg1), Tseq stream) {
   //println(yieldTerm(t, false));
@@ -718 +715 @@
 }
 
-//xxx
 Tseq pp(TopBinOp(arg0, leaf(arg1), arg2), Tseq stream) {
   return ast2stream(stream, pp, arg0, BinOp(arg1), arg2);
@@ -731 +727 @@
 }
 
-//xxx
-Tseq pp(TopParen(arg0), Tseq stream) {
+/*Tseq pp(TopParen(arg0), Tseq stream) {
   return ast2stream(stream, pp, LParen, arg0, RParen);
 }
-
+*/
 Tseq pp(TopPreOp(arg0, arg1), Tseq stream) {
   return ast2stream(stream, pp, arg0, arg1);
@@ -778 +773 @@
 }
 
-//xxx
 Tseq pp(VarDeclSugarNoType(arg0, arg1), Tseq stream) {
   return ast2stream(stream, pp, Keyword("var"), arg0, BinOp("="), arg1);
 }
 
-//xxx
 Tseq pp(VarDeclSugarNoExpr(arg0, arg1), Tseq stream) {
   return ast2stream(stream, pp, Keyword("var"), arg0, Colon, arg1);
@@ -807 +800 @@
   return ast2stream(stream, pp, arg0);
 }
-
-/*
-set[TokenCat] mgCategories = {"TOKEN", "SPC", "LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACKET", "RBRACKET", "BINOP", "PREOP", "COMMA", "KEYWORD", "SEMICOLON"};
-
-DecisionTable mgSpaceTable = makeTable((
-                <"SPC", "*"> : Skip(),
-                <"*", ""> : Nothing(),
-                <"*", "LPAREN"> : Nothing(), 
-                <"*", "LBRACKET"> : Nothing(),
-                <"LPAREN", "*"> : Insert(Nest(LvRel(0))),
-                <"RPAREN", "*"> : Insert(Nest(LvPop())),
-                <"RBRACKET", "*"> : Nothing(),
-                <"*", "LBRACE"> : Sequence([Insert(BeginIndent), Insert(Line())]),
-                <"*", "RBRACE"> : Insert(Line()),
-                <"RBRACE", "*"> : Sequence([Insert(EndIndent)]),
-                <"COMMA", "*"> : Nothing(),
-                <"*", "COMMA"> : Insert(Space(" ")),
-                <"*", "PREOP"> : Nothing(),
-                <"*", "SEMICOLON"> : Insert(Line()),
-                <"SEMICOLON", "*"> : Nothing(),
-                <"*", "DOT"> : Nothing(),
-                <"DOT", "*"> : Nothing(),
-                <"*", "*"> : Insert(Space(" "))
-        ), mgCategories);
-*/
-

trunk/magnolia-eclipse/src/org/magnolialang/testutil/core.clj

@@ -180 +180 @@
   (.string org.magnolialang.terms.TermFactory/vf s))
 
+(defn rbool [b]
+  (.bool org.magnolialang.terms.TermFactory/vf b))
+
 (defn get-option-string-fact [s]
   (let [state tu-state]
@@ -234 +237 @@
                    (ctor-get-val (get-type-checked s))))))
 
-(defn run-pretty-magnolia [s]
-  (rcall "runPrettyMagnolia" (rstring s)))
+(defn run-pretty-magnolia [s rich?]
+  (rcall "runPrettyMagnolia" (rstring s) (rbool rich?)))