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

Add basic support for multiline input to REPL #2434

Merged
merged 1 commit into from
Apr 12, 2023

Conversation

turbolent
Copy link
Member

@turbolent turbolent commented Apr 11, 2023

Work towards #2023

Description

Add basic support for multiline input by checking unmatched parentheses, braces, and brackets.


  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work
  • Code follows the standards mentioned here
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

@github-actions
Copy link

Cadence Benchstat comparison

This branch with compared with the base branch onflow:master commit fee6a8a
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
CheckContractInterfaceFungibleTokenConformance-2126µs ± 0%113µs ± 0%~(p=1.000 n=1+1)
ContractInterfaceFungibleToken-238.3µs ± 0%38.5µs ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2323ns ± 0%324ns ± 0%~(p=1.000 n=1+1)
ExportType/simple_type-266.5ns ± 0%52.6ns ± 0%~(p=1.000 n=1+1)
InterpretRecursionFib-22.49ms ± 0%2.50ms ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-21.08µs ± 0%1.09µs ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-2559ns ± 0%565ns ± 0%~(p=1.000 n=1+1)
ParseArray-28.37ms ± 0%7.65ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-211.6ms ± 0%11.4ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-21.31ms ± 0%1.20ms ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-2182µs ± 0%183µs ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-2154µs ± 0%148µs ± 0%~(p=1.000 n=1+1)
ParseInfix-27.06µs ± 0%7.11µs ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-22.41ns ± 0%2.41ns ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/Three_levels-2120ns ± 0%120ns ± 0%~(p=1.000 n=1+1)
RuntimeResourceDictionaryValues-25.11ms ± 0%5.15ms ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-27.42µs ± 0%4.11µs ± 0%~(p=1.000 n=1+1)
SuperTypeInference/arrays-2298ns ± 0%296ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/composites-2132ns ± 0%132ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/integers-298.5ns ± 0%98.8ns ± 0%~(p=1.000 n=1+1)
ValueIsSubtypeOfSemaType-292.5ns ± 0%93.8ns ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
CheckContractInterfaceFungibleTokenConformance-249.2kB ± 0%49.2kB ± 0%~(all equal)
ContractInterfaceFungibleToken-223.3kB ± 0%23.3kB ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2136B ± 0%136B ± 0%~(all equal)
ExportType/simple_type-20.00B 0.00B ~(all equal)
InterpretRecursionFib-21.00MB ± 0%1.00MB ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-2768B ± 0%768B ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-2200B ± 0%200B ± 0%~(all equal)
ParseArray-22.88MB ± 0%2.65MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-24.26MB ± 0%4.09MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-2214kB ± 0%214kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-228.9kB ± 0%28.9kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-228.9kB ± 0%28.9kB ± 0%~(p=1.000 n=1+1)
ParseInfix-21.92kB ± 0%1.92kB ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-20.00B 0.00B ~(all equal)
QualifiedIdentifierCreation/Three_levels-264.0B ± 0%64.0B ± 0%~(all equal)
RuntimeResourceDictionaryValues-22.29MB ± 0%2.28MB ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-22.70kB ± 0%2.70kB ± 0%~(all equal)
SuperTypeInference/arrays-296.0B ± 0%96.0B ± 0%~(all equal)
SuperTypeInference/composites-20.00B 0.00B ~(all equal)
SuperTypeInference/integers-20.00B 0.00B ~(all equal)
ValueIsSubtypeOfSemaType-248.0B ± 0%48.0B ± 0%~(all equal)
 
allocs/opdelta
CheckContractInterfaceFungibleTokenConformance-2806 ± 0%806 ± 0%~(all equal)
ContractInterfaceFungibleToken-2370 ± 0%370 ± 0%~(all equal)
ExportType/composite_type-23.00 ± 0%3.00 ± 0%~(all equal)
ExportType/simple_type-20.00 0.00 ~(all equal)
InterpretRecursionFib-218.9k ± 0%18.9k ± 0%~(all equal)
NewInterpreter/new_interpreter-213.0 ± 0%13.0 ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-24.00 ± 0%4.00 ± 0%~(all equal)
ParseArray-259.6k ± 0%59.6k ± 0%~(all equal)
ParseDeploy/byte_array-289.4k ± 0%89.4k ± 0%~(all equal)
ParseDeploy/decode_hex-263.0 ± 0%63.0 ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-2768 ± 0%768 ± 0%~(all equal)
ParseFungibleToken/Without_memory_metering-2768 ± 0%768 ± 0%~(all equal)
ParseInfix-248.0 ± 0%48.0 ± 0%~(all equal)
QualifiedIdentifierCreation/One_level-20.00 0.00 ~(all equal)
QualifiedIdentifierCreation/Three_levels-22.00 ± 0%2.00 ± 0%~(all equal)
RuntimeResourceDictionaryValues-236.9k ± 0%36.9k ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-243.0 ± 0%43.0 ± 0%~(all equal)
SuperTypeInference/arrays-23.00 ± 0%3.00 ± 0%~(all equal)
SuperTypeInference/composites-20.00 0.00 ~(all equal)
SuperTypeInference/integers-20.00 0.00 ~(all equal)
ValueIsSubtypeOfSemaType-21.00 ± 0%1.00 ± 0%~(all equal)
 

@codecov
Copy link

codecov bot commented Apr 11, 2023

Codecov Report

Merging #2434 (2f4cb0d) into master (fee6a8a) will decrease coverage by 0.05%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #2434      +/-   ##
==========================================
- Coverage   78.51%   78.47%   -0.05%     
==========================================
  Files         315      315              
  Lines       68661    68698      +37     
==========================================
  Hits        53910    53910              
- Misses      12945    12982      +37     
  Partials     1806     1806              
Flag Coverage Δ
unittests 78.47% <0.00%> (-0.05%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
runtime/parser/parser.go 90.57% <0.00%> (-1.61%) ⬇️
runtime/repl.go 0.00% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@turbolent turbolent merged commit 683ac15 into master Apr 12, 2023
13 of 16 checks passed
@turbolent turbolent deleted the bastian/repl-multiline branch April 12, 2023 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants