RTL перенесена в отдельную директорию

diff --git a/count.sh b/count.sh
index a07d82253e57e2ba65e88a30d5af2c5e536667d5..1e5db9d4cb6161501395c42576d05f640f69d145 100755 (executable)
--- a/count.sh
+++ b/count.sh
@@ -1,3 +1,16 @@
 #!/bin/sh
 
+echo Compiler Sources:
 wc -l $(find . -name '*.c' -or -name '*.h')
+
+echo
+echo Runtime Library:
+wc -l $(find rtl -name '*.java' -or -name '*.obn')
+
+echo
+echo Tests:
+wc -l $(find tests -name '*.obn')
+
+echo
+echo Total:
+wc -l $(find . -name '*.c' -or -name '*.h' -or -name '*.java' -or -name '*.obn') | grep total

diff --git a/notes b/notes
index 6c6cf6fbcef722eca42b59fd1c6f8e00f3024715..0fa3ba8caf13b9cb0c4c90fad00bebecd77c053f 100644 (file)
--- a/notes
+++ b/notes
@@ -2,10 +2,8 @@
 - Не полная реализация модуля Files 
     * Не реализована запись в файл
 
-- Нужна опция для задания списка директорий для поиска модулей.
-
 - Не полная реализация модуля Strings 
-    * РеализованÑ\8b Ñ\82олÑ\8cко пÑ\80оÑ\86едÑ\83Ñ\80Ñ\8b Length и Cap
+    * Ð\9dе Ñ\80еализованÑ\8b пÑ\80оÑ\86едÑ\83Ñ\80Ñ\8b Insert Append Delete Replace Extract Pos
 - Сделать проверку повторов в CASE.
 - Сделать нормальную проверку наличия RETURN.
 

diff --git a/obn-compile.sh b/obn-compile.sh
index 4ad5c3d6b261bc9f977b75efaf7957c00a217299..0ab4b702958017eca1500c06056856ce6ec34d16 100755 (executable)
--- a/obn-compile.sh
+++ b/obn-compile.sh
@@ -5,10 +5,10 @@ set -e
 rm -rf classes tmp
 mkdir -p classes tmp
 
-./a.out -d tmp $*
+./a.out -d tmp -I rtl/java -I rtl $*
 
 jasmin -d classes tmp/*.j
 
-javac -d classes rtl/*.java
+javac -d classes rtl/java/*.java
 
 proguard -injars classes -libraryjars /usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar @proguard.conf

diff --git a/Strings.obn b/rtl/Strings.obn
similarity index 100%
rename from Strings.obn
rename to rtl/Strings.obn

diff --git a/rtl/Files.java b/rtl/java/Files.java
similarity index 100%
rename from rtl/Files.java
rename to rtl/java/Files.java

diff --git a/Files.obn b/rtl/java/Files.obn
similarity index 100%
rename from Files.obn
rename to rtl/java/Files.obn

diff --git a/rtl/Launcher.java b/rtl/java/Launcher.java
similarity index 100%
rename from rtl/Launcher.java
rename to rtl/java/Launcher.java

diff --git a/rtl/Out.java b/rtl/java/Out.java
similarity index 100%
rename from rtl/Out.java
rename to rtl/java/Out.java

diff --git a/Out.obn b/rtl/java/Out.obn
similarity index 100%
rename from Out.obn
rename to rtl/java/Out.obn

diff --git a/rtl/SYSTEM.java b/rtl/java/SYSTEM.java
similarity index 100%
rename from rtl/SYSTEM.java
rename to rtl/java/SYSTEM.java