From 450753930a003263c4779081011c07800caa62fc Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 25 Sep 2021 16:39:48 +0200 Subject: [PATCH] cleanup warnings --- .../json/tests/CoreDslGenerationTest.xtend | 32 ------------------- .../tests/CoreDslGenerationUnitTest.xtend | 14 -------- .../coredsl/json/CoreDslGeneratorModule.xtend | 1 - .../coredsl/json/CoreDslJsonGenerator.xtend | 3 +- .../src/com/minres/coredsl/json/Main.xtend | 1 - 5 files changed, 1 insertion(+), 50 deletions(-) diff --git a/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend b/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend index 37fc494..65028ed 100644 --- a/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend +++ b/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 = '��' - val quote2 = '��' - fsa.generateFile("vm_" + model.name.toLowerCase + ".in.cpp", "vm-out", ''' - /* ��quote1��start generated code��quote2�� */ - InstructionDesriptor instr_descr[0] = {}; - /* ��quote1��end generated code��quote2�� */ - ''') - 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) - } } diff --git a/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationUnitTest.xtend b/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationUnitTest.xtend index 22ad9e8..7737f70 100644 --- a/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationUnitTest.xtend +++ b/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 diff --git a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslGeneratorModule.xtend b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslGeneratorModule.xtend index 35b5cc1..8c1d610 100644 --- a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslGeneratorModule.xtend +++ b/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 diff --git a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend index 14276b6..c17f0b7 100644 --- a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend +++ b/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', '') } diff --git a/com.minres.coredsl.json/src/com/minres/coredsl/json/Main.xtend b/com.minres.coredsl.json/src/com/minres/coredsl/json/Main.xtend index c0c627b..b966caf 100644 --- a/com.minres.coredsl.json/src/com/minres/coredsl/json/Main.xtend +++ b/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