config.WithHiddenLocation added

marketsim/gen/src/main/scala/Runner.scala

@@ -139,7 +139,7 @@ object Runner extends syntax.scala.Parser {
             val names_failed_file = ".output/names.failed.sc"
 
             for (output <- managed(new PrintWriter(names_file))) {
-                output.println(names)
+                config.WithHiddenLocation({ output.println(names) })
             }
 
             if (config.check_names)
@@ -149,7 +149,7 @@ object Runner extends syntax.scala.Parser {
                 }) map { names_2 =>
                     if (names_2 != names) {
                         for (output <- managed(new PrintWriter(names_failed_file))) {
-                            output.println(names_2)
+                            config.WithHiddenLocation({ output.println(names_2) })
                         }
                         println(s"Re-parsed names differ from original ones. Compare files '$names_file' and '$names_failed_file'")
                     }
@@ -174,7 +174,7 @@ object Runner extends syntax.scala.Parser {
             val typed_failed_file = ".output/typed.failed.sc"
 
             for (output <- managed(new PrintWriter(typed_file))) {
-                output.println(typed)
+                config.WithHiddenLocation({ output.println(typed) })
             }
 
             if (config.check_typed)
@@ -185,7 +185,7 @@ object Runner extends syntax.scala.Parser {
                     }) map { typed_2 =>
                         if (typed != typed_2) {
                             for (output <- managed(new PrintWriter(typed_failed_file))) {
-                                output.println(typed_2)
+                                config.WithHiddenLocation({ output.println(typed_2) })
                             }
                             println(s"Re-parsed names differ from original ones. Compare files '$typed_file' and '$typed_failed_file'")
                         }

marketsim/gen/src/main/scala/config.scala

@@ -18,6 +18,16 @@ package object config
     def catch_errors = !instance.get.skip_errors
     def verbose = instance.get.verbose
 
+    var show_location : Boolean = true
+
+    def WithHiddenLocation[T](f : => T) = {
+        val old = show_location
+        show_location = false
+        val x = f
+        show_location = old
+        x
+    }
+
     def With(args: Array[String])(f : => Unit)
     {
         val parser = new scopt.OptionParser[Config]("gen")

marketsim/gen/src/main/scala/predef.scala

@@ -170,30 +170,9 @@ package object predef {
         def asCode : Code
     }
 
-    sealed abstract class PrintMode
-
-    case object ScalaMode extends PrintMode
-
-    object ScPyPrintable
-    {
-        var printMode : PrintMode = ScalaMode
-    }
-
     trait ScPyPrintable extends ScPrintable with PyPrintable
     {
-        override def toString = ScPyPrintable.printMode match {
-            case ScalaMode => toScala
-        }
-
-        def as(m : PrintMode) = {
-            val old_mode = ScPyPrintable.printMode
-            ScPyPrintable.printMode = m
-            val ret = toString
-            ScPyPrintable.printMode = old_mode
-            ret
-        }
-
-        def asScala = as(ScalaMode)
+        def asScala = toScala
     }
 
 }

marketsim/gen/src/main/scala/syntax/scala/Printer.scala

@@ -212,7 +212,7 @@ package object Printer
             def printBody : String
 
             protected def toScala = {
-                (crlf   + s"// defined at $filename: " + pos + crlf
+                (crlf   + (if (config.show_location) s"// defined at $filename: " + pos + crlf else "")
                         + ifSome(docstring)
                         + decorators.map({_ + crlf}).mkString("")
                         + "def " + name