Reame functions, adapt to HerbSpecification.jl
#11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ReubenJ
requested changes
Feb 1, 2024
src/interpreter.jl
Outdated
| function test_all_examples(tab::SymbolTable, expr::Any, examples::Vector{Example})::Vector{Bool} | ||
| function test_all_examples(tab::SymbolTable, expr::Any, examples::Vector{IOExample})::Vector{Bool} | ||
| depwarn("`test_all_examples` is deprecated and should no longer be used.", :test_all_examples) | ||
| throw(ErrorException("`test_all_examples` has been deprecated and should not be used.")) |
There was a problem hiding this comment.
Suggested change
| throw(ErrorException("`test_all_examples` has been deprecated and should not be used.")) |
We shouldn't throw an exception for a deprecation. We can remove the function entirely in the next release, but for now the depwarn is enough.
src/interpreter.jl
Outdated
| function evaluate_program(program::RuleNode, examples::Vector{<:Example}, grammar::Grammar, evaluation_function::Function) | ||
| function evaluate_program(program::RuleNode, examples::Vector{<:IOExample}, grammar::Grammar, evaluation_function::Function) | ||
| depwarn("`evaluate_program` is deprecated and should no longer be used. Please use HerbSearch.evaluate instead.", :evaluate_program) | ||
| throw(ErrorException("`evaluate_program` has been deprecated and should not be used.")) |
There was a problem hiding this comment.
Suggested change
| throw(ErrorException("`evaluate_program` has been deprecated and should not be used.")) |
Here too.
|
|
||
| Executes a given expression on a set of inputs and returns the respective outputs. | ||
| WARNING: This function throws exceptions that are caused in the given expression. | ||
| These exceptions have to be handled by the caller of this function. | ||
| """ | ||
| function execute_on_examples(tab::SymbolTable, expr::Any, example_inputs::Vector{Dict{Symbol, Any}})::Vector{Any} | ||
| return [test_with_input(tab, expr, example) for example in example_inputs] | ||
| function execute_on_input(tab::SymbolTable, expr::Any, input::Vector{Dict{Symbol, Any}})::Vector{Any} |
There was a problem hiding this comment.
If we have a Vector and non-Vector version for the Grammar, let's add a Vector version of the SymbolTable version.
src/interpreter.jl
Outdated
Comment on lines
183
to
197
| elseif ex.head == :while | ||
| max_iterations = 1000 | ||
| result = nothing | ||
|
|
||
| for i in 1:max_iterations # limit iterations to 1000 | ||
| if !interpret(tab, ex.args[1]) | ||
| break | ||
| end | ||
| if i == max_iterations | ||
| error("Exceeded maximum number of iterations in while-loop.") | ||
| end | ||
|
|
||
| result = interpret(tab, ex.args[2]) | ||
| end | ||
| return result |
There was a problem hiding this comment.
I think we should parameterize max_iterations with a default argument to interpret(...).
There was a problem hiding this comment.
And should split the addition of while loops into a different PR
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
test_with_inputtoexecute_on_input(see Renametest_with_inputandexecute_on_examples#10)