From 288912d2a84d035730cad405e32a6afa5dd4f9c6 Mon Sep 17 00:00:00 2001
From: Cliff Click <cliffc@acm.org>
Date: Sat, 10 May 2025 10:55:15 -0700
Subject: Move sys.smp to smp directory

---
 .../main/java/com/seaofnodes/simple/Parser.java    |  3 +--
 .../src/main/java/com/seaofnodes/simple/sys.java   | 25 ++++++++++++++++++++++
 .../main/java/com/seaofnodes/simple/sys/sys.java   | 25 ----------------------
 3 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 chapter22/src/main/java/com/seaofnodes/simple/sys.java
 delete mode 100644 chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java

(limited to 'chapter22/src/main/java/com/seaofnodes')

diff --git a/chapter22/src/main/java/com/seaofnodes/simple/Parser.java b/chapter22/src/main/java/com/seaofnodes/simple/Parser.java
index 9c22fc43..d0ef5d49 100644
--- a/chapter22/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter22/src/main/java/com/seaofnodes/simple/Parser.java
@@ -141,7 +141,7 @@ public class Parser {
         _scope.mem(new MemMergeNode(false));
 
         // Parse the sys import
-        _lexer = new Lexer(com.seaofnodes.simple.sys.sys.SYS);
+        _lexer = new Lexer(com.seaofnodes.simple.sys.SYS);
         while( !_lexer.isEOF() ) {
             parseStatement();
             _lexer.skipWhiteSpace();
@@ -795,7 +795,6 @@ public class Parser {
         while (!peek('}') && !_lexer.isEOF())
             parseStatement().isKill();
 
-
         // Grab the declarations and build fields and a Struct
         int lexlen = _scope._lexSize.last();
         int varlen = _scope._vars._len;
diff --git a/chapter22/src/main/java/com/seaofnodes/simple/sys.java b/chapter22/src/main/java/com/seaofnodes/simple/sys.java
new file mode 100644
index 00000000..45106770
--- /dev/null
+++ b/chapter22/src/main/java/com/seaofnodes/simple/sys.java
@@ -0,0 +1,25 @@
+package com.seaofnodes.simple;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+
+/** Default included namespaces for Simple.
+
+    You can think of this as {@code #include <stdio.h>} for C or {@code import java.lang.*} for Java.
+ */
+public abstract class sys {
+
+    public static final String SYS;
+
+    static {
+        try {
+            SYS = Files.readString(Path.of("src/main/smp/sys.smp"));
+        }
+        catch( Exception e ) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java b/chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java
deleted file mode 100644
index 399e7cb7..00000000
--- a/chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.seaofnodes.simple.sys;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-
-/** Default included namespaces for Simple.
-
-    You can think of this as {@code #include <stdio.h>} for C or {@code import java.lang.*} for Java.
- */
-public abstract class sys {
-
-    public static final String SYS;
-
-    static {
-        try {
-            SYS = Files.readString(Path.of("src/main/java/com/seaofnodes/simple/sys/sys.smp"));
-        }
-        catch( Exception e ) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
-- 
cgit v1.2.3