Use specified context instead of current in "eval"

urbic · May 10, 2024 · 105003a · 105003a
1 parent b9314fa
commit 105003a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyEvaluable.java b/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyEvaluable.java
@@ -15,13 +15,13 @@ public interface PsyEvaluable
 	*
 	*	@throws PsyErrorException when an error occurs durind evaluation of this object.
 	*/
-	public void psyEval()
+	public void psyEval(final PsyContext oContext)
 		throws PsyErrorException;
 
 	/**
 	*	Context action of the {@code eval} operator.
 	*/
 	@OperatorType("eval")
-	public static final ContextAction PSY_EVAL
-		=ContextAction.<PsyEvaluable>ofConsumer(PsyEvaluable::psyEval);
+	public static final ContextAction PSY_EVAL=oContext->
+		oContext.operandStackBacked(1).<PsyEvaluable>getBacked(0).psyEval(oContext);
 }
diff --git a/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyReader.java b/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyReader.java
@@ -40,11 +40,10 @@ public PsyReader(final InputStream is)
 	}
 
 	@Override
-	public void psyEval()
+	public void psyEval(final PsyContext oContext)
 		throws PsyErrorException
 	{
-		// TODO
-		PsyContext.psyCurrentContext().interpret(this);
+		oContext.interpret(this);
 	}
 
 	public Reader reader()

diff --git a/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyTextual.java b/src/main/java/coneforest.psylla/coneforest/psylla/core/PsyTextual.java
@@ -35,10 +35,10 @@ default public PsyName psyToName()
 	}
 
 	@Override
-	default public void psyEval()
+	default public void psyEval(final PsyContext oContext)
 		throws PsyErrorException
 	{
-		(new PsyStringReader(this)).psyEval();
+		(new PsyStringReader(this)).psyEval(oContext);
 	}
 
 	@Override

diff --git a/src/main/java/coneforest.psylla/coneforest/psylla/runtime/Interpreter.java b/src/main/java/coneforest.psylla/coneforest/psylla/runtime/Interpreter.java
@@ -273,6 +273,7 @@ public void interpret(final PsyReader oReader)
 				if(getStopped())
 					return;
 			}
+			// Incomplete procedure read
 			if(procstack.size()>initProcLevel)
 			{
 				var e=new PsySyntaxErrorException();
@@ -708,7 +709,7 @@ public boolean loadLibraryResource(final String resourceName)
 				else
 				{
 					resourceRegistry.put(resourceName, resourceID);
-					new PsyFileReader(oFullResourceName).psyEval();
+					new PsyFileReader(oFullResourceName).psyEval(this);
 				}
 				return true;
 			}