cleanup warnings

com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend

@@ -1,7 +1,6 @@
 package com.minres.coredsl.json.tests
 
 import com.google.inject.Inject
-import com.minres.coredsl.coreDsl.CoreDef
 import com.minres.coredsl.coreDsl.DescriptionContent
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.xtext.generator.GeneratorContext
@@ -137,35 +136,4 @@ Core RV32I {
 //            '''.toString, fsa.textFiles.get(IFileSystemAccess::DEFAULT_OUTPUT+"Alice.java").toString
 //        )
     }
-    @Test
-    def void expandCppFile() {
-        val content = parseHelper.parse(isa_rv32i)
-        assertNotNull(content)
-        val resource = content.eResource
-        EcoreUtil.resolveAll(resource);
-        assertEquals(0, resource.errors.size)
-        assertEquals(0, resource.warnings.size)
-        val CoreDef model = content.definitions.get(0) as CoreDef
-        assertNotNull(model)
-        val fsa = new InMemoryFileSystemAccess()
-        val quote1 = '<27><>'
-        val quote2 = '<27><>'
-        fsa.generateFile("vm_" + model.name.toLowerCase + ".in.cpp", "vm-out", '''
-        	/* <20><>quote1<65><31>start generated code<64><65>quote2<65><32> */
-        	InstructionDesriptor instr_descr[0] = {};
-        	/* <20><>quote1<65><31>end generated code<64><65>quote2<65><32>  */
-        ''')
-        generator.doGenerate(model.eResource, fsa, new GeneratorContext => [
-			cancelIndicator = CancelIndicator.NullImpl
-		])
-        println(fsa.textFiles)
-        assertEquals(2,fsa.textFiles.size)
-        assertTrue(fsa.textFiles.containsKey("DEFAULT_OUTPUTRV32I.txt"))
-//        assertEquals(
-//            '''
-//            public class Bob {
-//                 
-//            }
-//            '''.toString, fsa.textFiles.get(IFileSystemAccess::DEFAULT_OUTPUT+"Bob.java").toString)         
-    }
  }

com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationUnitTest.xtend

@@ -59,13 +59,6 @@ class CoreDslGenerationUnitTest{
             }
         '''.addInstructionContext.parse
         validator.assertNoErrors(content)
-        val ref = '''
-            void CLI(){
-                {
-                    if(rd ==  0) *(X+rd) = (uint32_t)(int32_t)sext<6>(imm);
-                }
-            }
-            '''
         val fsa = new InMemoryFileSystemAccess()
         generator.doGenerate(content.eResource, fsa, new GeneratorContext => [
             cancelIndicator = CancelIndicator.NullImpl
@@ -93,13 +86,6 @@ class CoreDslGenerationUnitTest{
             }
         '''.addInstructionContext.parse
         validator.assertNoErrors(content)
-        val ref = '''
-            void CLI(){
-                {
-                    if(rd ==  0) *(X+rd) = (uint32_t)(int32_t)sext<6>(imm);
-                }
-            }
-            '''
         val fsa = new InMemoryFileSystemAccess()
         generator.doGenerate(content.eResource, fsa, new GeneratorContext => [
             cancelIndicator = CancelIndicator.NullImpl

com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslGeneratorModule.xtend

@@ -1,7 +1,6 @@
 package com.minres.coredsl.json
 
 import com.google.inject.Binder
-import com.google.inject.Provider
 import com.minres.coredsl.CoreDslRuntimeModule
 import org.eclipse.xtext.generator.IFileSystemAccess2
 import org.eclipse.xtext.generator.IGenerator2

com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend

@@ -3,7 +3,6 @@
  */
 package com.minres.coredsl.json
 
-import com.google.inject.Inject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.AbstractGenerator
 import org.eclipse.xtext.generator.IFileSystemAccess2
@@ -55,7 +54,7 @@ class CoreDslJsonGenerator extends AbstractGenerator {
 		val ret = new JSONObject();
   		ret.put("decoding", inst.encoding.fields.map[it.asString].join(' '))
   		ret.put("name", inst.name);
-  		ret.put('disassembly', inst.disass!= null? inst.name.toLowerCase + ' ' + inst.disass.toLowerCase : inst.name)
+  		ret.put('disassembly', inst.disass !== null? inst.name.toLowerCase + ' ' + inst.disass.toLowerCase : inst.name)
   		ret.put('execution', inst.behavior.toString)
   		ret.put('restrictions', '')
 	}

com.minres.coredsl.json/src/com/minres/coredsl/json/Main.xtend

@@ -25,7 +25,6 @@ import org.eclipse.xtext.validation.CheckMode
 import org.eclipse.xtext.parser.ParseException
 import org.eclipse.xtext.generator.GeneratorContext
 import org.eclipse.xtext.generator.IFileSystemAccess
-import picocli.CommandLine.ITypeConverter
 import java.lang.reflect.MalformedParametersException
 import org.apache.log4j.Level
 import org.eclipse.emf.ecore.resource.Resource