[#201] as-8080, as-z80: fix includes

plugins/compiler/as-8080/build.gradle

@@ -23,6 +23,7 @@ plugins {
   id 'java'
   id 'idea'
   id 'antlr'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/LexicalAnalyzerImpl.java

@@ -200,6 +200,9 @@ public void reset(InputStream inputStream) throws IOException {
     }
 
     private int convertLexerTokenType(int tokenType) {
+        if (tokenType == EOF) {
+            return Token.EOF;
+        }
         return tokenMap[tokenType];
     }
 }

plugins/compiler/as-8080/src/main/java/net/emustudio/plugins/compiler/as8080/visitors/ExpandIncludesVisitor.java

@@ -8,11 +8,10 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import java.nio.file.Path;
+import java.util.*;
 
 import static net.emustudio.plugins.compiler.as8080.CompileError.couldNotReadFile;
 import static net.emustudio.plugins.compiler.as8080.CompileError.infiniteLoopDetected;
@@ -21,7 +20,8 @@
  * Integrate "include" files and remove PseudoInclude
  */
 public class ExpandIncludesVisitor extends NodeVisitor {
-    private final Set<String> includedFiles; // TODO: windows platform case-insensitive!
+    private final Set<String> includedFiles;
+    private Optional<String> inputFileName = Optional.empty();
 
     public ExpandIncludesVisitor() {
         this.includedFiles = Collections.emptySet();
@@ -31,20 +31,28 @@ public ExpandIncludesVisitor(Set<String> includedFiles) {
         this.includedFiles = Objects.requireNonNull(includedFiles);
     }
 
+    @Override
+    public void visit(Program node) {
+        this.inputFileName = node.getFileName();
+        super.visit(node);
+    }
+
     @Override
     public void visit(PseudoInclude node) {
         if (includedFiles.contains(node.filename)) {
             fatalError(infiniteLoopDetected(node, "include"));
         }
 
         try {
-            As8080Lexer lexer = new As8080Lexer(CharStreams.fromFileName(node.filename));
+            String absoluteFileName = findAbsoluteFileName(node.filename);
+
+            As8080Lexer lexer = new As8080Lexer(CharStreams.fromFileName(absoluteFileName));
             CommonTokenStream stream = new CommonTokenStream(lexer);
             As8080Parser parser = new As8080Parser(stream);
             stream.fill();
             ParseTree tree = parser.rStart();
             Program program = new Program(node.line, node.column, env);
-            program.setFileName(node.filename);
+            program.setFileName(absoluteFileName);
 
             new CreateProgramVisitor(program).visit(tree);
 
@@ -58,4 +66,20 @@ public void visit(PseudoInclude node) {
             error(couldNotReadFile(node, node.filename, e));
         }
     }
+
+    private String findAbsoluteFileName(String includeFileName) {
+        File includeFile = new File(includeFileName);
+        if (includeFile.isAbsolute()) {
+            return includeFileName;
+        }
+
+        return inputFileName
+            .map(f -> f.replace("\\", File.separator))
+            .map(File::new)
+            .map(File::getParentFile)
+            .map(File::toPath)
+            .map(p -> p.resolve(includeFileName))
+            .map(Path::toString)
+            .orElse(includeFileName);
+    }
 }

plugins/compiler/as-ssem/build.gradle

@@ -23,6 +23,7 @@ plugins {
   id 'java'
   id 'idea'
   id 'antlr'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/compiler/as-z80/build.gradle

@@ -23,6 +23,7 @@ plugins {
   id 'java'
   id 'idea'
   id 'antlr'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/AssemblerZ80.java

@@ -118,6 +118,7 @@ public boolean compile(String inputFileName, String outputFileName) {
             parser.addErrorListener(new ParserErrorListener());
 
             Program program = new Program();
+            program.setFileName(inputFileName);
             new CreateProgramVisitor(program).visit(parser.rStart());
 
             IntelHEX hex = new IntelHEX();

plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/ast/NameSpace.java

@@ -2,6 +2,7 @@
 
 import net.emustudio.plugins.compiler.asZ80.CompileError;
 
+import java.io.File;
 import java.util.*;
 
 public class NameSpace {

plugins/compiler/as-z80/src/main/java/net/emustudio/plugins/compiler/asZ80/visitors/ExpandIncludesVisitor.java

@@ -8,11 +8,10 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import java.nio.file.Path;
+import java.util.*;
 
 import static net.emustudio.plugins.compiler.asZ80.CompileError.couldNotReadFile;
 import static net.emustudio.plugins.compiler.asZ80.CompileError.infiniteLoopDetected;
@@ -21,8 +20,9 @@
  * Integrate "include" files and remove PseudoInclude
  */
 public class ExpandIncludesVisitor extends NodeVisitor {
-    private final Set<String> includedFiles; // TODO: windows platform case-insensitive!
-
+    private final Set<String> includedFiles;
+    private Optional<String> inputFileName = Optional.empty();
+
     public ExpandIncludesVisitor() {
         this.includedFiles = Collections.emptySet();
     }
@@ -31,20 +31,28 @@ public ExpandIncludesVisitor(Set<String> includedFiles) {
         this.includedFiles = Objects.requireNonNull(includedFiles);
     }
 
+    @Override
+    public void visit(Program node) {
+        this.inputFileName = node.getFileName();
+        super.visit(node);
+    }
+
     @Override
     public void visit(PseudoInclude node) {
         if (includedFiles.contains(node.filename)) {
             fatalError(infiniteLoopDetected(node, "include"));
         }
 
         try {
-            AsZ80Lexer lexer = new AsZ80Lexer(CharStreams.fromFileName(node.filename));
+            String absoluteFileName = findAbsoluteFileName(node.filename);
+
+            AsZ80Lexer lexer = new AsZ80Lexer(CharStreams.fromFileName(absoluteFileName));
             CommonTokenStream stream = new CommonTokenStream(lexer);
             AsZ80Parser parser = new AsZ80Parser(stream);
             stream.fill();
             ParseTree tree = parser.rStart();
             Program program = new Program(node.line, node.column, env);
-            program.setFileName(node.filename);
+            program.setFileName(absoluteFileName);
 
             new CreateProgramVisitor(program).visit(tree);
 
@@ -58,4 +66,20 @@ public void visit(PseudoInclude node) {
             error(couldNotReadFile(node, node.filename, e));
         }
     }
+
+    private String findAbsoluteFileName(String includeFileName) {
+        File includeFile = new File(includeFileName);
+        if (includeFile.isAbsolute()) {
+            return includeFileName;
+        }
+
+        return inputFileName
+            .map(f -> f.replace("\\", File.separator))
+            .map(File::new)
+            .map(File::getParentFile)
+            .map(File::toPath)
+            .map(p -> p.resolve(includeFileName))
+            .map(Path::toString)
+            .orElse(includeFileName);
+    }
 }

plugins/compiler/brainc-brainduck/build.gradle

@@ -23,6 +23,7 @@ plugins {
   id 'java'
   id 'org.xbib.gradle.plugin.jflex' version "1.5.0"
   id "com.github.andrescv.jcup" version "1.0"
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/compiler/ramc-ram/build.gradle

@@ -23,6 +23,7 @@ plugins {
   id 'java'
   id 'org.xbib.gradle.plugin.jflex' version "1.5.0"
   id "com.github.andrescv.jcup" version "1.0"
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/compiler/raspc-rasp/build.gradle

@@ -23,6 +23,7 @@ plugins {
   id 'java'
   id 'org.xbib.gradle.plugin.jflex' version "1.5.0"
   id "com.github.andrescv.jcup" version "1.0"
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/cpu/brainduck-cpu/build.gradle

@@ -22,6 +22,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 plugins {
   id 'java'
   id 'net.emustudio.edigen-plugin' version '1.4.0'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 repositories {

plugins/cpu/ram-cpu/build.gradle

@@ -21,11 +21,12 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 repositories {
+  mavenLocal()
   mavenCentral()
-  jcenter()
 }
 
 dependencies {

plugins/cpu/rasp-cpu/build.gradle

@@ -21,11 +21,12 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 repositories {
+  mavenLocal()
   mavenCentral()
-  jcenter()
 }
 
 dependencies {

plugins/cpu/ssem-cpu/build.gradle

@@ -29,6 +29,7 @@ buildscript {
 plugins {
   id 'java'
   id 'net.emustudio.edigen-plugin' version '1.4.0'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 repositories {

plugins/device/88-dcdd/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/device/88-sio/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/device/abstract-tape/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/device/adm3A-terminal/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/device/brainduck-terminal/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/device/simhPseudo-z80/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/device/ssem-display/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/memory/brainduck-mem/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/memory/byte-mem/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/memory/ram-mem/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/memory/rasp-mem/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {

plugins/memory/ssem-mem/build.gradle

@@ -21,6 +21,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id 'java'
+  id 'com.adarshr.test-logger' version '3.1.0'
 }
 
 dependencies {