From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Fri, 18 Aug 2017 20:20:25 +0000 (+0300)
Subject: RTL перенесена в отдельную директорию
X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=commitdiff_plain;h=0f382f6efef254a295e71dc82ddd0f87b95aaddd

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

diff --git a/count.sh b/count.sh
index a07d822..1e5db9d 100755
--- 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 6c6cf6f..0fa3ba8 100644
--- a/notes
+++ b/notes
@@ -2,10 +2,8 @@
 - Не полная реализация модуля Files 
     * Не реализована запись в файл
 
-- Нужна опция для задания списка директорий для поиска модулей.
-
 - Не полная реализация модуля Strings 
-    * Реализованы только процедуры Length и Cap
+    * Не реализованы процедуры Insert Append Delete Replace Extract Pos
 - Сделать проверку повторов в CASE.
 - Сделать нормальную проверку наличия RETURN.
 
diff --git a/obn-compile.sh b/obn-compile.sh
index 4ad5c3d..0ab4b70 100755
--- 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