SVI Выстаскивание модуля STRING

source/AMD64.ob07

@@ -1,7 +1,15 @@
 MODULE AMD64;
 
-IMPORT IL, BIN, WR := WRITER, CHL := CHUNKLISTS, LISTS, PATHS, PROG, TARGETS,
-       REG, UTILS IN "./utils/UTILS.ob07", S := STRINGS, PE32, ELF, X86, ERRORS;
+IMPORT IL,
+    BIN,
+    WR := WRITER,
+    CHL := CHUNKLISTS,
+    LISTS,
+    PATHS, PROG, TARGETS,
+    REG,
+    UTILS IN "./utils/UTILS.ob07",
+    S := STRINGS IN "./strings/STRINGS.ob07",
+    PE32, ELF, X86, ERRORS;
 
 
 CONST

source/ARITH.ob07

@@ -1,6 +1,8 @@
 MODULE ARITH;
 
-IMPORT STRINGS, UTILS IN "./utils/UTILS.ob07", LISTS;
+IMPORT STRINGS IN "./strings/STRINGS.ob07",
+    UTILS IN "./utils/UTILS.ob07",
+    LISTS;
 
 
 CONST

source/CONSOLE.ob07

@@ -1,6 +1,7 @@
 MODULE CONSOLE;
 
-IMPORT UTILS IN "./utils/UTILS.ob07", STRINGS;
+IMPORT UTILS IN "./utils/UTILS.ob07",
+    STRINGS IN "./strings/STRINGS.ob07";
 
 
 PROCEDURE String* (s: ARRAY OF CHAR);

source/Compiler.ob07

@@ -1,7 +1,11 @@
 MODULE Compiler;
 
-IMPORT ST := STATEMENTS, PARS, UTILS IN "./utils/UTILS.ob07", PATHS, PROG, C := CONSOLE,
-       ERRORS, STRINGS, WRITER, MSP430, THUMB, TARGETS, SCAN, TEXTDRV;
+IMPORT ST := STATEMENTS, PARS,
+    UTILS IN "./utils/UTILS.ob07",
+    PATHS, PROG, C := CONSOLE,
+    ERRORS,
+    STRINGS IN "./strings/STRINGS.ob07",
+    WRITER, MSP430, THUMB, TARGETS, SCAN, TEXTDRV;
 
 
 CONST

source/ELF.ob07

@@ -1,6 +1,13 @@
 MODULE ELF;
 
-IMPORT BIN, WR := WRITER, CHL := CHUNKLISTS, LISTS, PE32, UTILS IN "./utils/UTILS.ob07", STRINGS;
+IMPORT
+    BIN,
+    WR := WRITER,
+    CHL := CHUNKLISTS,
+    LISTS,
+    PE32,
+    UTILS IN "./utils/UTILS.ob07",
+    STRINGS IN "./strings/STRINGS.ob07";
 
 
 CONST

source/IL.ob07

@@ -1,6 +1,9 @@
 MODULE IL;
 
-IMPORT LISTS, SCAN, STRINGS, CHL := CHUNKLISTS, C := COLLECTIONS, TARGETS, PATHS;
+IMPORT LISTS,
+    SCAN,
+    STRINGS IN "./strings/STRINGS.ob07",
+    CHL := CHUNKLISTS, C := COLLECTIONS, TARGETS, PATHS;
 
 
 CONST

source/PARS.ob07

@@ -1,7 +1,19 @@
 MODULE PARS;
 
-IMPORT PROG, SCAN, ARITH, STRINGS, ERRORS, LISTS, IL, CONSOLE, PATHS, UTILS IN "./utils/UTILS.ob07",
-       C := COLLECTIONS, TARGETS, THUMB, MSP430;
+IMPORT PROG,
+    SCAN,
+    ARITH,
+    STRINGS IN "./strings/STRINGS.ob07",
+    ERRORS,
+    LISTS,
+    IL,
+    CONSOLE,
+    PATHS,
+    UTILS IN "./utils/UTILS.ob07",
+    C := COLLECTIONS,
+    TARGETS,
+    THUMB,
+    MSP430;
 
 
 CONST

source/PATHS.ob07

@@ -1,6 +1,7 @@
 MODULE PATHS;
 
-IMPORT STRINGS, UTILS IN "./utils/UTILS.ob07";
+IMPORT STRINGS IN "./strings/STRINGS.ob07",
+    UTILS IN "./utils/UTILS.ob07";
 
 
 CONST

source/PROG.ob07

@@ -1,6 +1,15 @@
 MODULE PROG;
 
-IMPORT SCAN, LISTS, ARITH, ERRORS, C := COLLECTIONS, IL, UTILS IN "./utils/UTILS.ob07", TARGETS, STRINGS, PATHS;
+IMPORT SCAN,
+    LISTS,
+    ARITH,
+    ERRORS,
+    C := COLLECTIONS,
+    IL,
+    UTILS IN "./utils/UTILS.ob07",
+    TARGETS,
+    STRINGS IN "./strings/STRINGS.ob07",
+    PATHS;
 
 
 CONST

source/RVMxI.ob07

@@ -2,7 +2,12 @@
 
 IMPORT
 
-    PROG, WR := WRITER, IL, CHL := CHUNKLISTS, REG, UTILS IN "./utils/UTILS.ob07", STRINGS, ERRORS, TARGETS;
+    PROG,
+    WR := WRITER,
+    IL, CHL := CHUNKLISTS, REG,
+    UTILS IN "./utils/UTILS.ob07",
+    STRINGS IN "./strings/STRINGS.ob07",
+    ERRORS, TARGETS;
 
 
 CONST

source/SCAN.ob07

@@ -1,6 +1,9 @@
 MODULE SCAN;
 
-IMPORT TXT := TEXTDRV, ARITH, S := STRINGS, ERRORS, LISTS;
+IMPORT TXT := TEXTDRV,
+    ARITH,
+    S := STRINGS IN "./strings/STRINGS.ob07",
+    ERRORS, LISTS;
 
 
 CONST

source/STATEMENTS.ob07

@@ -1,8 +1,12 @@
 MODULE STATEMENTS;
 
 IMPORT
-
-    PARS, PROG, SCAN, ARITH, STRINGS, LISTS, IL, X86, AMD64, MSP430, THUMB, RVMxI,
+    PARS,
+    PROG,
+    SCAN,
+    ARITH,
+    STRINGS IN "./strings/STRINGS.ob07",
+    LISTS, IL, X86, AMD64, MSP430, THUMB, RVMxI,
     ERRORS, UTILS IN "./utils/UTILS.ob07", AVL := AVLTREES, CONSOLE, C := COLLECTIONS, TARGETS;
 
 

source/STRINGS.ob07 → source/strings/STRINGS.ob07

@@ -1,6 +1,6 @@
 MODULE STRINGS;
 
-IMPORT UTILS IN "./utils/UTILS.ob07";
+IMPORT UTILS IN "../utils/UTILS.ob07";
 
 
 PROCEDURE copy* (src: ARRAY OF CHAR; VAR dst: ARRAY OF CHAR; spos, dpos, count: INTEGER);