Various Cleanup

Author: tsuckow

command-line/src/main/scala/net/codingwell/weave/CommandLine/Main.scala

@@ -49,16 +49,16 @@ object Main {
 
       //Get the compiler
       var app:Application = injector.getInstance(classOf[Application])
-      app.run
+      app.run( config.toplevel )
    }
 }
 
 
 class Application @Inject() ( compiler:WeaveCompiler, profiler:Profiler, system:ActorSystem ) {
-  def run() = {
+  def run( filename:String ) = {
       println(".")
 
-      val file = new NativeWeaveFile( new File("samples/newtest.silk"), "silk" )
+      val file = new NativeWeaveFile( new File( filename ), "silk" )
 
       val files = List( file )
 

core-api/src/main/scala/net/codingwell/weave/WeaveCompiler.scala

@@ -112,7 +112,8 @@ class WeaveCompiler @Inject() ( @Named("WeaveActor") val weaveActor:ActorRef ) {
 
   def compile( files:Seq[WeaveFile] ):Unit = {
     implicit val timeout = Timeout(5 seconds)
-    weaveActor ! WeaveActor.QueueFile( new NativeWeaveFile( new File("../samples/test3.silk"), "silk") )
+    //TODO: This only compiles first file
+    weaveActor ! WeaveActor.QueueFile( files.head )
 
     val future = weaveActor ? WeaveActor.Join
 

lang-silk/src/main/scala/net/codingwell/weave/languages/silk/Semantic.scala

@@ -50,41 +50,6 @@ trait ExpressionState
   def getValue():ConnectionSignal
 }
 
-class ExpressionModuleState( val machine:ExpressionStateMachine, val value:ConnectionSignal ) extends ExpressionState {
-  def processExpression( expression:ast.Expression ) = {
-    expression.next match {
-      case None =>
-        expression.simple match {
-          case ast.Identifier( name ) =>
-            println( "Value State ID: " + name )
-
-            val symbol = machine.scope.lookup( name )
-
-            symbol match {
-              case Some( DeclarationSymbol( connection ) ) =>
-                throw new Exception("Value followed by value")
-              case Some( symbol @ ModuleSymbol( name, parameters ) ) =>
-                //TODO: Handle parameters
-                //println( "ID is Module in Module State" )
-                machine.state = new ExpressionModuleHalfState( machine, symbol, value )
-              case None =>
-                println( "No ID" )
-            }
-
-
-          case ast.ExpressionGroup( expressions ) =>
-            throw new Exception("Module expected got group")
-          case unknown =>
-            println( "Value State Unknown: " + unknown.toString() )
-        }
-      case _ =>
-        println("Chain Expressions not implemented." )
-    }
-  }
-
-  def getValue() = { value }
-}
-
 class ExpressionModuleHalfState( val machine:ExpressionStateMachine, val module:ModuleSymbol, val rhs:ConnectionSignal ) extends ExpressionState {
   def processExpression( expression:ast.Expression ) = {
     expression.next match {
@@ -118,7 +83,7 @@ class ExpressionModuleHalfState( val machine:ExpressionStateMachine, val module:
                   case unknown =>
                     throw InvalidDirectionException(unknown)
                 }
-                machine.state = new ExpressionModuleState( machine, new ModuleConnection( instance, module.parameters.orderedParameters(2).signal ) )
+                machine.state = new ExpressionValueState( machine, new ModuleConnection( instance, module.parameters.orderedParameters(2).signal ) )
               case Some( ModuleSymbol( name, parameters ) ) =>
                 //println( "ID is Module" )
                 throw new Exception("Value expected got module")
@@ -149,7 +114,7 @@ class ExpressionModuleHalfState( val machine:ExpressionStateMachine, val module:
               case unknown =>
                 throw InvalidDirectionException(unknown)
             }
-            machine.state = new ExpressionModuleState( machine, new ModuleConnection( instance, module.parameters.orderedParameters(2).signal ) )
+            machine.state = new ExpressionValueState( machine, new ModuleConnection( instance, module.parameters.orderedParameters(2).signal ) )
 
           case unknown =>
             println( "Value State Unknown: " + unknown.toString() )

lang-silk/src/main/scala/net/codingwell/weave/languages/silk/SymbolTable.scala

@@ -98,7 +98,7 @@ object built_in {
 
 //This isn't right, but right concept
 //Maybe move the statements into another class, we don't really seem to ever refer to the module from them anyway.
-class AssignmentModuleSymbol( parameters:ModuleParameters ) extends ModuleSymbol( "", parameters )
+//class AssignmentModuleSymbol( parameters:ModuleParameters ) extends ModuleSymbol( "", parameters )
 
 case class DeclarationSymbol( val connection:Connection ) extends Symbol {
 }

lang-verilog/src/main/scala/net/codingwell/weave/languages/verilog/Generator.scala

@@ -26,7 +26,7 @@ class GeneratorState () {
 
     identifierSalt = identifierSalt + 1
 
-    "_$_WEAVE_$__GEN__" + id.toString
+    "_$_" + id.toString
   }
 }