Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/short circuit #490

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Feat/short circuit #490

merged 2 commits into from
Sep 11, 2024

Conversation

SuperFola
Copy link
Member

@SuperFola SuperFola commented Sep 10, 2024

Description

and and or should be able to short-circuit. Currently, the following code:

(let foo (fun () {
  (print "ok")
  true }))
(and (foo) (foo))

would print ok twice (because the operator needs to evaluate each argument to give an answer).

However we can short-circuit on the first false value for and, and on the first true value for or, to avoid evaluating unneeded values. This PR implements exactly this behaviour, by removing the AND_ and OR_ instructions, adding a DUP instruction and using POP_JUMP_IF_(TRUE|FALSE).

Checklist

  • I have read the Contributor guide
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have updated the documentation if needed
  • I have added tests that prove my fix/feature is working
  • New and existing tests pass locally with my changes

Documentation will have to be updated since some instructions were removed and other have a new bytecode.

Copy link

Static analysis report

Lizard report

Listing only functions with cyclomatic complexity >= 15 or NLOC >= 100 or parameters >= 6.

Filename Start line:end line Function name Parameters NLOC CCN
src/arkreactor/VM/VM.cpp 266:1091 Ark::VM::safeRun 2 668 164
src/arkreactor/Compiler/BytecodeReader.cpp 196:513 Ark::BytecodeReader::display 4 284 124
src/arkreactor/Compiler/Compiler.cpp 558:723 Ark::Compiler::handleCalls 5 133 40
src/arkreactor/Compiler/Compiler.cpp 265:356 Ark::Compiler::compileExpression 5 75 25
src/arkreactor/Compiler/NameResolutionPass.cpp 133:210 Ark::internal::NameResolutionPass::visitKeyword 2 70 20
Report about files you didn't modify in this PR
Filename Start line:end line Function name Parameters NLOC CCN
src/arkreactor/Compiler/Macros/Processor.cpp 273:581 Ark::internal::MacroProcessor::evaluate 3 291 118
src/arkscript/REPL/Repl.cpp 17:225 Ark::Repl::Repl 1 176 35
include/Ark/Compiler/AST/Parser.hpp 87:176 Ark::internal::ARK_APIParser::string 0 87 32
src/arkscript/main.cpp 17:320 main 2 262 28
src/arkscript/JsonCompiler.cpp 24:189 JsonCompiler::_compile 1 139 23
src/arkreactor/Compiler/AST/Node.cpp 209:279 Ark::internal::Node::debugPrint 1 61 23
include/utf8.hpp 138:184 utf8::isValid 1 44 21
src/arkreactor/Compiler/Macros/Processor.cpp 124:194 Ark::internal::MacroProcessor::processNode 2 54 21
src/arkreactor/Compiler/AST/Parser.cpp 270:397 Ark::internal::Parser::import_ 0 103 21
src/arkreactor/Compiler/Macros/Executors/Function.cpp 12:86 Ark::internal::FunctionExecutor::applyMacro 2 60 18
src/arkreactor/Compiler/AST/Node.cpp 143:207 Ark::internal::Node::repr 0 56 17
src/arkreactor/VM/Value.cpp 77:135 Ark::Value::toString 1 46 17
include/Ark/Compiler/AST/Predicates.hpp 162:186 Ark::internal::IsSymbol::operator ( ) 1 24 16
src/arkreactor/Compiler/Macros/Processor.cpp 53:98 Ark::internal::MacroProcessor::registerMacro 1 41 16
src/arkscript/Formatter.cpp 152:205 Formatter::format 3 51 15
src/arkreactor/Exceptions.cpp 86:130 Ark::Diagnostics::makeContext 6 35 15
src/arkreactor/TypeChecker.cpp 28:85 Ark::types::displayContract 2 51 15
src/arkreactor/Exceptions.cpp 133:142 Ark::Diagnostics::helper 9 9 3
include/Ark/Exceptions.hpp 92:101 Ark::CodeError::CodeError 6 10 1

CppCheck report

Filename Line Type Description
src/arkreactor/Compiler/BytecodeReader.cpp 331 style struct member 'Arg::arg' is never used.
Report files about files you didn't modify in this PR
Filename Line Type Description
src/arkreactor/Builtins/IO.cpp 24 style Parameter 'n' can be declared with const
src/arkreactor/Builtins/IO.cpp 43 style Parameter 'n' can be declared with const
include/Ark/Compiler/AST/Optimizer.hpp 64 style Unused private function: 'Optimizer::throwOptimizerError'
include/Ark/Compiler/AST/Optimizer.hpp 70 style Unused private function: 'Optimizer::removeUnused'
src/arkreactor/Compiler/AST/Parser.cpp 389 error Uninitialized variable: import_data.with_prefix
include/Ark/Compiler/Macros/Processor.hpp 165 performance Function parameter 'origin' should be passed by const reference.
src/arkreactor/Compiler/Macros/Executor.cpp 12 performance Function parameter 'origin' should be passed by const reference.
include/Ark/Compiler/Macros/Executor.hpp 65 performance Function parameter 'origin' should be passed by const reference.
src/arkreactor/Compiler/Macros/Executors/Function.cpp 14 style The scope of the variable 'first' can be reduced.
src/arkreactor/Compiler/Macros/Processor.cpp 27 performance Variable 'm_predefined_macros' is assigned in constructor body. Consider performing initialization in initialization list.
src/arkreactor/Compiler/Macros/Processor.cpp 252 performance Function parameter 'origin' should be passed by const reference.
src/arkreactor/VM/Scope.cpp 51 style Variable 'id' is not assigned a value.
src/arkreactor/VM/Scope.cpp 61 style Variable 'id' is not assigned a value.
src/arkreactor/VM/Scope.cpp 71 style Variable 'id' is not assigned a value.
src/arkscript/REPL/Repl.cpp 24 style Consider using std::copy algorithm instead of a raw loop.
src/arkscript/REPL/Repl.cpp 26 style Consider using std::copy algorithm instead of a raw loop.
src/arkscript/REPL/Repl.cpp 28 style Consider using std::copy algorithm instead of a raw loop.
src/arkscript/REPL/Repl.cpp 30 style Consider using std::copy algorithm instead of a raw loop.
src/arkscript/REPL/Repl.cpp 34 style Consider using std::transform algorithm instead of a raw loop.
src/arkscript/REPL/Repl.cpp 36 style Consider using std::transform algorithm instead of a raw loop.
src/arkscript/REPL/Repl.cpp 45 style Consider using std::transform algorithm instead of a raw loop.
src/arkscript/main.cpp 75 information Unmatched suppression: constStatement

Copy link

Fuzzing report

/usr/local/bin/afl-whatsup status check tool for afl-fuzz by Michal Zalewski

Summary stats

    Fuzzers alive : 0
   Dead or remote : 1 (included in stats)
   Total run time : 5 minutes, 0 seconds
      Total execs : 41 thousands
 Cumulative speed : 139 execs/sec
    Pending items : 108 faves, 868 total
 Coverage reached : 10.03%
    Crashes saved : 1
      Hangs saved : 0

Cycles without finds : 0
Time without finds : 0

[+] Captured 30487 tuples (map size 172670, highest value 255, total values 281660253) in '/dev/null'.
[+] A coverage of 30487 edges were achieved out of 172672 existing (17.66%) with 880 input files.

@SuperFola SuperFola merged commit 3c9e3ab into dev Sep 11, 2024
20 checks passed
@SuperFola SuperFola deleted the feat/short-circuit branch September 11, 2024 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant