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.

Sign up for GitHub

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

Jump to bottom

Add missing non-method ops (typer layer) #347

Merged
merged 17 commits into from
Jan 17, 2019
Merged

Add missing non-method ops (typer layer) #347

merged 17 commits into from
Jan 17, 2019

Conversation

greenhat
Copy link
Member

@greenhat greenhat commented Dec 27, 2018 •
edited
Loading

#324

Close #349

Todo:

  • convert existing predefined global functions to use PredefinedFunc;
  • implement new predefined global functions (see spec);
  • fix ergo (pass network prefix to compiler);

@greenhat greenhat added the S-wip Status: Work in progress label Dec 27, 2018
@greenhat greenhat force-pushed the i324-typer-layer branch 3 times, most recently from 4ca8ea5 to a3ea5b2 Compare December 31, 2018 11:04
ergomorphic
ergomorphic requested changes Jan 4, 2019
View reviewed changes
Copy link
Collaborator

@ergomorphic ergomorphic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments

src/main/scala/sigmastate/lang/SigmaTyper.scala Outdated Show resolved Hide resolved
src/main/scala/sigmastate/serialization/OpCodes.scala Outdated Show resolved Hide resolved
@greenhat greenhat force-pushed the i324-typer-layer branch 2 times, most recently from d859ad9 to 84899c9 Compare January 4, 2019 13:29
@greenhat greenhat mentioned this pull request Jan 10, 2019
Merged
11 tasks
@greenhat greenhat added S-ready-for-merge Status: This PR is ready for merge and removed S-wip Status: Work in progress labels Jan 15, 2019
aslesarenko
aslesarenko requested changes Jan 15, 2019
View reviewed changes
Copy link
Member

@aslesarenko aslesarenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but please see comments

src/main/scala/org/ergoplatform/ErgoAddress.scala Outdated Show resolved Hide resolved
src/main/scala/sigmastate/lang/SigmaPredef.scala Outdated Show resolved Hide resolved
src/test/scala/sigmastate/lang/SigmaParserTest.scala Outdated Show resolved Hide resolved
src/test/scala/sigmastate/lang/SigmaParserTest.scala Outdated Show resolved Hide resolved
src/test/scala/sigmastate/lang/SigmaTyperTest.scala Outdated Show resolved Hide resolved
@greenhat greenhat changed the base branch from master to v2.0 January 16, 2019 14:45
@greenhat
add/test byteArrayToLong, decodePoint, xofOf in typer;
23f4d51 
add/test (red) outerJoin in typer;

fixed types in outerJoin predef sig;
add handling Ident in ApplyTypes in typer;

add PredefinedFuncRegistry and use it in typer;
@greenhat
add a predefined func registry lookup in CompiletimeCosting;
cf270ac 
remove allOf case in CompiletimeCosting;
@greenhat
fix unapply for predefined func application;
1da0b01
@greenhat
move TreeModificationsCode op code;
e61a6ac
@greenhat
pass PredefinedFuncRegistry as a parameter into typer and binder;
1482650
@greenhat
provide a default value to sigma builder parameter in the compiler (d…
535030f 
…on't leak builder into ergo);
@greenhat
use ergo branch network-prefix-in-compiler for testing;
124d349
@greenhat
use Nullable in PredefinedFuncApply recognizer;
c85b3a5
@greenhat
using PredefinedFunc's in parser and typer tests;
c83ce4c
@greenhat
convert anyOf to PredefinedFunc
abc5c44 
convert atLeast to PredefinedFunc;
change irBuilder to be PartialFunction;
switch SigmaCompilerTest to the new pipeline (with costing);

convert ZKProof to PredefinedFunc;

convert sigmaProp to PredefinedFunc;

convert getVar to PredefinedFunc;
add downcast to byte for getVar id constant value in typer;

convert PK to PredefinedFunc and move evaluation to binder;
remove sigmastate compiler from RuntimeCosting;
add detailed error on decoding ergo address with wrong network prefix;

convert deserialize to PredefinedFunc;
@greenhat
move ir node building (PredefinedFunc's unwrap) from CompiletimeCosti…
7550ccb 
…ng to typer;

remove ir node building (PredefinedFunc's unwrap) from binder (handled in typer);
remove StringConcat ir node (and free up it's op code);
convert fromBaseX to PredefinedFunc's;
@greenhat
convert blake2g256 to PredefinedFunc;
9b0079c 
convert sha256 to PredefinedFunc;

convert byteArrayToBigInt, byteArrayToLong, decodePoint to PredefinedFunc;

make network prefix required in compiler;

convert longToByteArray to PredefinedFunc;

convert proveDHTuple to PredefinedFunc;
@greenhat
speed up PredefinedFuncApply;
608acbe
@greenhat
convert proveDlog to PredefinedFunc;
6aad536 
convert isMember to PredefinedFunc;

convert treeLookup to PredefinedFunc;

convert treeModifications to PredefinedFunc;

convert xorOf to PredefinedFunc;

convert substConstants to PredefinedFunc;
remove predefinedEnv in SigmaPredef;

add executeFromVar to SigmaPredef;
@greenhat
fix deserialize return value to be non-optional (according to spec);
b878b57
@greenhat greenhat merged commit 0c05a82 into v2.0 Jan 17, 2019
@greenhat greenhat mentioned this pull request Jan 28, 2019
Closed
@kushti kushti deleted the i324-typer-layer branch May 4, 2019 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ergomorphic ergomorphic ergomorphic requested changes

@aslesarenko aslesarenko aslesarenko requested changes

Assignees
No one assigned
Labels
S-ready-for-merge Status: This PR is ready for merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@greenhat @aslesarenko @ergomorphic