Merge pull request #1 from umjammer/0.0.1

0.0.1

Author: umjammer

.github/workflows/codeql-analysis.yml

@@ -30,20 +30,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD
-      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,9 +52,8 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
-    - name: Autobuild
-      run: |
-        mvn -B install --file pom.xml
+    - name: Build with Maven
+      run: mvn -B install --file pom.xml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/maven.yml

@@ -8,11 +8,19 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: |
-        mvn -B package --file pom.xml
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Check w/o SNAPSHOT when "bump version"
+        if: ${{ contains(github.event.head_commit.message, 'bump version') }}
+        run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

README.md

@@ -37,6 +37,7 @@ basic language collection as jsr223
  * https://github.com/mayuropensource/PuffinBASIC
  * https://github.com/EgonOlsen71/basicv2
  * https://github.com/namazu510/basic-interpreter
+ * http://www.kiwi-us.com/~ohta/pc88/kanji/
 
 ## TODO
 

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-script-basic</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.1</version>
 
   <build>
     <plugins>
@@ -18,54 +18,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>native-maven-plugin</artifactId>
-        <version>1.0-alpha-11</version>
-        <extensions>true</extensions>
-        <configuration>
-          <javahOS>darwin</javahOS>
-          <compilerProvider>generic-classic</compilerProvider>
-          <compilerStartOptions>
-            <compilerStartOption>-g -Wall -O2 -fomit-frame-pointer -fPIC</compilerStartOption>
-            <!-- unless locating jdk includes, cause error why??? -->
-            <compilerStartOption>-arch x86_64
-              -I${java.home}/../include
-              -I${java.home}/../include/darwin
-              -I.
-            </compilerStartOption>
-          </compilerStartOptions>
-          <sources>
-            <source>
-              <directory>src/test/native</directory>
-              <fileNames>
-                <fileName>test.m</fileName>
-              </fileNames>
-            </source>
-          </sources>
-          <linkerStartOptions>
-            <linkerStartOption>-arch x86_64
-              -lobjc -framework Foundation -framework JavaNativeFoundation
-              -ljvm -L${java.home}/../jre/lib/server
-            </linkerStartOption>
-          </linkerStartOptions>
-          <linkerFinalName/>
-          <linkerEndOptions>
-            <linkerEndOption>-o ${project.build.directory}/jvmtest</linkerEndOption>
-          </linkerEndOptions>
-        </configuration>
-        <executions>
-          <execution>
-            <id>compile-pvorbis</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-              <goal>link</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -92,7 +44,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.8.2</version>
+        <version>5.9.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -103,7 +55,7 @@
     <dependency>
       <groupId>com.github.umjammer</groupId>
       <artifactId>vavi-commons</artifactId>
-      <version>1.1.6</version>
+      <version>1.1.8</version>
     </dependency>
 
     <dependency>

src/test/java/Main2.java

@@ -8,46 +8,50 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.stream.IntStream;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import vavi.util.Debug;
 
 
 /**
- * Main1.
+ * Main2.
  *
  * @author <a href="mailto:umjammer@gmail.com">Naohide Sano</a> (umjammer)
  * @version 0.00 2022/03/02 umjammer initial version <br>
  */
 public class Main2 {
 
     @Test
+    @DisplayName("convert n-basic")
     void test1() throws Exception {
         main(new String[] {});
     }
 
     @Test
+    @Disabled("create properties for n-basic")
     void test3() throws Exception {
-        IntStream.range(0, NBasicBin2Text2.keywordsBase.length).forEach(i ->
-                System.err.printf("%02X=%s%n", 0x81 + i, NBasicBin2Text2.keywordsBase[i]));
-        IntStream.range(0, NBasicBin2Text2.keywordsFF.length).forEach(i ->
-                System.err.printf("FF_%02X=%s%n", 0x81 + i, NBasicBin2Text2.keywordsFF[i]));
+        IntStream.range(0, NBasicBin2Ascii.keywordsBase.length).forEach(i ->
+                System.err.printf("%02X=%s%n", 0x81 + i, NBasicBin2Ascii.keywordsBase[i]));
+        IntStream.range(0, NBasicBin2Ascii.keywordsFF.length).forEach(i ->
+                System.err.printf("FF_%02X=%s%n", 0x81 + i, NBasicBin2Ascii.keywordsFF[i]));
     }
 
     @Test
+    @DisplayName("convert n88-basic")
     void test2() throws Exception {
-        Test1.main(new String[] {"src/test/resources/grph3d.bas"});
+        N88BasicBin2Ascii.main(new String[] {"src/test/resources/grph3d.bas"});
     }
 
     /**
-     * @param args
+     * run n-basic converter
      */
     public static void main(String[] args) throws Exception {
         Path p = Paths.get(Main2.class.getResource("/grph3d.bas").toURI());
 
-        NBasicBin2Text2 covetrer = new NBasicBin2Text2();
+        NBasicBin2Ascii covetrer = new NBasicBin2Ascii();
         try {
             covetrer.convert(Files.newInputStream(p), System.out);
         } catch (EOFException e) {

src/test/java/Test1.java renamed to src/test/java/N88BasicBin2Ascii.java

@@ -16,27 +16,31 @@
 
 
 /**
- * N88-BASIC 中間コードファイルをアスキーに変換
+ * convert N88-BASIC(86) middle code file to ascii file.
  * <p>
  * TODO space between keyword and keyword
  *
  * @author @kishi24
  * @version 2022/06/10 ver.1.6.1
  */
-public class Test1 {
+public class N88BasicBin2Ascii {
 
+    /** */
     static int offset = 0;
 
+    /** */
     static final Properties data = new Properties();
 
     static {
         try {
             // TODO we need to change table for n80, n88, n88(86)
-            data.load(Test1.class.getResourceAsStream("/n98.properties"));
+            data.load(N88BasicBin2Ascii.class.getResourceAsStream("/n98.properties"));
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
     }
+
+    /** */
     static String read_4byte(LittleEndianDataInputStream file) throws IOException {
         int one = file.readUnsignedByte();
         int two = file.readUnsignedByte();
@@ -47,11 +51,11 @@ static String read_4byte(LittleEndianDataInputStream file) throws IOException {
             return "0";
         }
 
-        // 仮数部の処理
+        // process mantissa
         String kasu = String.format("%02x%02x%02x", three, two, one);
         String frac = Integer.toBinaryString(Integer.parseInt(kasu, 16));
 
-        // to_s(2) による桁落ちを補正
+        // adjust precision loss by to_s(2)
         if (24 > frac.length()) {
             int m = 24 - frac.length();
             for (int i = 0; i < m; i++) {
@@ -68,7 +72,7 @@ static String read_4byte(LittleEndianDataInputStream file) throws IOException {
             frac = '1' + frac.substring(1);
         }
 
-        // 0b から実数へ変換
+        // convert to real number from 0b
         double num = 0.0;
         for (int i = 0; i <= 22; i++) {
             if ('1' == frac.charAt(i)) {
@@ -77,7 +81,7 @@ static String read_4byte(LittleEndianDataInputStream file) throws IOException {
         }
         num = num * Math.pow(2, e);
 
-        // 有効桁 7 におさめて行末の 0 を削除
+        // round significant 7 digits and trim trailer 0
         String[] data2 = String.valueOf(num).split("\\.");
         if (data2[1].matches("^0+$")) {
             return (sign ? "-" : "") + data2[0] + "!";
@@ -99,6 +103,7 @@ static String read_4byte(LittleEndianDataInputStream file) throws IOException {
         return num2;
     }
 
+    /** */
     static String read_8byte(LittleEndianDataInputStream file) throws IOException {
         int one = file.readUnsignedByte();
         int two = file.readUnsignedByte();
@@ -154,6 +159,9 @@ static String read_8byte(LittleEndianDataInputStream file) throws IOException {
         return num2;
     }
 
+    /**
+     * @param args 0: basic file
+     */
     public static void main(String[] args) throws IOException {
 
         String file = args[0];

src/test/java/NBasicBin2Text2.java renamed to src/test/java/NBasicBin2Ascii.java

@@ -11,8 +11,13 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-
-public class NBasicBin2Text2 {
+/**
+ * N-Basic.
+ *
+ * @author <a href="mailto:umjammer@gmail.com">Naohide Sano</a> (nsano)
+ * @version 0.00 2022/03/03 nsano initial version <br>
+ */
+public class NBasicBin2Ascii {
 
     static final String[] keywordsBase = {
             "END", "FOR", "NEXT", "DATA", "INPUT", "DIM", "READ", "LET", "GOTO", "RUN", "IF", "RESTORE", "GOSUB", "RETURN", "REM",
@@ -56,7 +61,7 @@ private static void usage() {
 
     public static void main(String[] args) throws IOException {
 
-        NBasicBin2Text2 app = new NBasicBin2Text2();
+        NBasicBin2Ascii app = new NBasicBin2Ascii();
 
         String srcFileName = null;
         String dstFileName = null;

src/test/resources/logging.properties

@@ -1,15 +1,7 @@
 handlers=java.util.logging.ConsoleHandler
 .level=INFO
-# Limit the message that are printed on the console to INFO and above.
 java.util.logging.ConsoleHandler.level=ALL
-#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-# %1:date/time %2:className and methodName %3logName %4:level %5:message %6:errormessage
-#java.util.logging.SimpleFormatter.format=%1$tY/%1$tm/%1$td %1$tH:%1$tM:%1$tS.%1$tL [%4$s] %5$s %6$s%n
-
-# HttpUrlConnection
-#java.util.logging.ConsoleHandler.level=ALL
-#sun.net.www.protocol.http.HttpURLConnection.level=ALL
-org.rococoa.level=ALL
-
 java.util.logging.ConsoleHandler.formatter=vavi.util.logging.VaviFormatter
-#java.util.logging.ConsoleHandler.formatter=vavi.util.logging.BetterFormatter
+
+#vavi.util.level=FINE
+org.rococoa.level=FINEST