Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
urbic committed May 9, 2024
1 parent 29ad861 commit 2f2a78c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions psylla.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion src/bin/psylla-debian
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ find_java_runtime openjdk

find_jars coneforest.psylla jline

run_java coneforest.psylla.Psylla "$@"
run_java coneforest.psylla.runtime.Psylla "$@"
2 changes: 1 addition & 1 deletion src/bin/psylla-redhat
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/docbook/PsyllaReference_Development.docbook
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 2f2a78c

Please sign in to comment.