From 2f2a78cdaa2b5a6d88c9d4f08d2d34435df71ede Mon Sep 17 00:00:00 2001
From: Anton Shvetz <shvetz.anton@gmail.com>
Date: Thu, 9 May 2024 06:29:48 +0300
Subject: [PATCH] Fix

---
 psylla.sh                                                 | 4 ++--
 src/bin/psylla-debian                                     | 2 +-
 src/bin/psylla-redhat                                     | 2 +-
 src/doc/docbook/PsyllaReference_Development.docbook       | 2 +-
 .../coneforest/psylla/core/PsyIndexed.java                | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/psylla.sh b/psylla.sh
index fa20ca6ee..1eefb2d09 100755
--- a/psylla.sh
+++ b/psylla.sh
@@ -5,7 +5,7 @@ if [ -x /usr/bin/build-classpath ]; then
 		--add-reads coneforest.psylla=ALL-UNNAMED \
 		-cp $(build-classpath jline1) \
 		-p target/artifacts/jar:$(build-classpath coneforest.clianthus) \
-		coneforest.psylla.Psylla \
+		coneforest.psylla.runtime.Psylla \
 		-Isrc/main/psylla \
 		"$@"
 fi
@@ -15,5 +15,5 @@ if [ -r /usr/lib/java-wrappers/java-wrappers.sh ]; then
 	find_java_runtime openjdk
 	JAVA_CLASSPATH=target/lib/psylla.jar
 	find_jars jline ./target/lib/psylla.jar
-	run_java coneforest.psylla.Psylla -Isrc/main/psylla "$@"
+	run_java coneforest.psylla.runtime.Psylla -Isrc/main/psylla "$@"
 fi
diff --git a/src/bin/psylla-debian b/src/bin/psylla-debian
index 3e56429eb..8d73279e7 100755
--- a/src/bin/psylla-debian
+++ b/src/bin/psylla-debian
@@ -8,4 +8,4 @@ find_java_runtime openjdk
 
 find_jars coneforest.psylla jline
 
-run_java coneforest.psylla.Psylla "$@"
+run_java coneforest.psylla.runtime.Psylla "$@"
diff --git a/src/bin/psylla-redhat b/src/bin/psylla-redhat
index 5fdfbaf27..0abd0a037 100755
--- a/src/bin/psylla-redhat
+++ b/src/bin/psylla-redhat
@@ -18,7 +18,7 @@ if [ -f $HOME/.psyllarc ] ; then
 fi
 
 # Configuration
-MAIN_CLASS=coneforest.psylla.Psylla
+MAIN_CLASS=coneforest.psylla.runtime.Psylla
 BASE_FLAGS=""
 BASE_OPTIONS=""
 BASE_JARS="psylla coneforest.clianthus jline1"
diff --git a/src/doc/docbook/PsyllaReference_Development.docbook b/src/doc/docbook/PsyllaReference_Development.docbook
index 78567ecef..973a0131e 100644
--- a/src/doc/docbook/PsyllaReference_Development.docbook
+++ b/src/doc/docbook/PsyllaReference_Development.docbook
@@ -16,7 +16,7 @@ The extension of the language is done by adding new operators and types.
 The new operator is implemented as a subclass of the
 <classname>coneforest.psylla.core.PsyOperator</classname> class. In the
 operator class, you should override the method <methodname
-xlink:href="../../javadoc/coneforest/psylla/core/PsyObject.html#invoke(coneforest.psylla.Interpreter)">invoke()</methodname>.
+xlink:href="../../javadoc/coneforest/psylla/core/PsyObject.html#invoke(coneforest.psylla.runtime.Interpreter)">invoke()</methodname>.
 Этот метод получает интерпретатор как параметр и выполняет требуемое действие,
 нужным образом манипулируя с интерпретатором.
 </para>
diff --git a/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyIndexed.java b/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyIndexed.java
index 648b4d6e1..c3b4340ab 100644
--- a/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyIndexed.java
+++ b/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyIndexed.java
@@ -203,15 +203,15 @@ default public PsyIterable<PsyObject> psyEntries()
 				public void psyForAll(final PsyObject oProc)
 					throws PsyErrorException
 				{
-					final coneforest.psylla.Interpreter interpreter
-						=(coneforest.psylla.Interpreter)PsyContext.psyCurrentContext();
-					final coneforest.psylla.OperandStack ostack=interpreter.operandStack();
+					final coneforest.psylla.runtime.Interpreter interpreter
+						=(coneforest.psylla.runtime.Interpreter)PsyContext.psyCurrentContext();
+					final coneforest.psylla.runtime.OperandStack ostack=interpreter.operandStack();
 					final java.util.Iterator<K> iterator=psyKeys().iterator();
 					interpreter.pushLoopLevel();
 					interpreter.executionStack().push(new PsyOperator("#forall_continue")
 						{
 							@Override
-							public void action(final coneforest.psylla.Interpreter interpreter1)
+							public void action(final coneforest.psylla.runtime.Interpreter interpreter1)
 								throws PsyErrorException
 							{
 								if(iterator.hasNext())