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

Implement missing type methods (typer layer) #358

Merged
merged 39 commits into from
Feb 19, 2019
Merged

Implement missing type methods (typer layer) #358

merged 39 commits into from
Feb 19, 2019

Conversation

greenhat
Copy link
Member

@greenhat greenhat commented Jan 10, 2019 •
edited
Loading

#324
Close #344

Todo:

  • "shifting" SCollection methods;
  • rebase ontov2.0 after Add missing non-method ops (typer layer) #347 is merged;
  • methods from other types;
  • the rest of missing SCollection methods;
  • SCollection.zip, partition type cannot be expressed (circular dependency on STuple);
  • SCollection.mapReduce;
  • move existing IR building code from CompiletimeCosting into SMethod.irBuilder;
  • try pulling a few MethodCall based collection method through the costing;
  • test new methods (MethodCall based) pulled through the costing in interpreter;
  • add costOf(node) for MethodCall ops (RuntimeCosting);
  • move to special.sigma appending of the result type of the lambda to arg list on MethodCall eval and also for other methods with RType implicit argument (if any) cmt

@greenhat greenhat added the S-wip Status: Work in progress label Jan 10, 2019
@greenhat greenhat force-pushed the i324-methods-and-i344 branch 2 times, most recently from 56cdc54 to 152c55a Compare January 16, 2019 11:17
@greenhat greenhat force-pushed the i324-methods-and-i344 branch from 64f096f to b8776f4 Compare January 16, 2019 14:53
@greenhat greenhat force-pushed the i324-methods-and-i344 branch from b8776f4 to 87ad4d0 Compare January 17, 2019 14:53
@greenhat greenhat changed the base branch from i324-typer-layer to v2.0 January 17, 2019 14:54
@greenhat greenhat force-pushed the i324-methods-and-i344 branch from 717b89e to 9891b78 Compare January 23, 2019 13:44
@greenhat greenhat mentioned this pull request Jan 23, 2019
Closed
@greenhat greenhat force-pushed the i324-methods-and-i344 branch from 9891b78 to 63bb585 Compare January 28, 2019 08:41
aslesarenko
aslesarenko reviewed Jan 28, 2019
View reviewed changes
src/main/scala/sigmastate/eval/RuntimeCosting.scala Outdated Show resolved Hide resolved
src/main/scala/sigmastate/eval/RuntimeCosting.scala Outdated Show resolved Hide resolved
src/main/scala/sigmastate/eval/RuntimeCosting.scala Outdated Show resolved Hide resolved
src/test/scala/sigmastate/lang/SigmaCompilerTest.scala
}

property("SCollection.flatMap") {
testMissingCosting("OUTPUTS.flatMap({ (out: Box) => Coll(out.value >= 1L) })",
comp("OUTPUTS.flatMap({ (out: Box) => Coll(out.value >= 1L) })") shouldBe
Copy link
Member

Choose a reason for hiding this comment

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

@greenhat The flatMap can accept only limited lambdas as arguments.
Currently:

  1. x => x._1
  2. box => MethodCall(box, name, List())
  3. x: Coll[T] => x

Copy link
Member

Choose a reason for hiding this comment

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

please put this requirements into description of method call both LangSpec.md and special.collection.Colls.scala

Copy link
Member Author

Choose a reason for hiding this comment

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

@aslesarenko Done. What's the reason for this limitation? I'm struggling to find where and how it's enforced.

@greenhat greenhat force-pushed the i324-methods-and-i344 branch from e7c41e8 to 1309475 Compare January 31, 2019 13:19
@greenhat greenhat force-pushed the i324-methods-and-i344 branch 3 times, most recently from accf789 to 602738f Compare February 18, 2019 09:58
@greenhat greenhat added S-ready-for-merge Status: This PR is ready for merge and removed S-wip Status: Work in progress labels Feb 18, 2019
@greenhat
Implement MethodCallLike to MethodCall transformation for SCollection…
5401f47 
… methods in the typer;
@greenhat
add SMethod.irBuilder;
e8287ef 
add Apply(Select) to MethodCallLike transformation in binder for collections;
implement irBuilder for getOrElse method;
add indices and flatMap methods;
@greenhat
add MethodCall method definition to numeric types (binder, typer);
7b5b0a2 
add toBytes and toBits methods to numeric types;
@greenhat
remove MethodCallLike creation in binder for type methods;
ed2690f 
add Apply(Select)/Select to MethodCall transformation to typer(via method.irBuilder);
add SBigInt.multModQ method;
@greenhat
add SBox.tokens method;
9bf939d
@greenhat
move withSubstTypes from SFunc to SType;
1ad610c 
add SOption.toColl method;
@greenhat
add CONTEXT global variable;
ff0574e 
add CONTEXT.dataInputs to MethodCall translation;
@greenhat
import Context trait under ErgoContext name (to not shadow Context ob…
5d099ba 
…ject);
@greenhat
add SAvlTree.digest;
ce7cf3b
@greenhat
add SCollection.zip and partition;
c0c37a1
@greenhat
make SCollection.FindMethod lazy val to avoid circular dep with SOpti…
64d75da 
…on object;
@greenhat
remove Context, should be implemented according to #350;
1effba6
@greenhat
add SCollection.mapReduce;
3bd1ca2
@greenhat
pull through costing Coll.indexOf, indices, flatMap methods;
5f6b158
@greenhat
code cleanup;
0f49ecd
@greenhat
add the limitations of flatMap's function;
a02d6ee
@greenhat
alter a flatMap invocation handling in evaluation (append lambda resu…
318ebad 
…lt type to args);

add eval tests for flatMap, indices and indexOf;
@greenhat
add segmentLength eval test and fix signature (missing from);
ff7de1b
@greenhat
update segmentLength compiler test to treat as implemented (in coster);
f44b842
@greenhat
add Coll.indexWhere to eval and fix signature (missing from parameter);
1dbacc8
@greenhat
handle all Coll methods in one case;
e450d46
@greenhat
add Coll.lastIndexWhere to eval and fix signature (missing from param…
07f22a0 
…eter);
@greenhat
add Option.map and filter implementation (failing);
ce32e50
@greenhat
add SCollection.zip;
796db69
@greenhat
add SCollection.partition;
0c9515f
@greenhat
fix SCollection.partiotion compiler test;
f63bfb1
@greenhat
fix SCollection.patch;
39fbda6
@greenhat
fix SCollection.updated;
293b511
@greenhat
fix SCollection.updateMany;
36c4c69
@greenhat
ignore failing tests (explanation in #324 comment);
ce8e9cd
@greenhat
fix build after rebase;
394fa0c
@greenhat
add Numeric.min/max to the lang spec;
6863413
@greenhat
enable Boolean.toByte test
b30a079
@greenhat
fix build after rebase;
4c35205
@greenhat greenhat force-pushed the i324-methods-and-i344 branch from 08ecf81 to 4c35205 Compare February 19, 2019 04:25
aslesarenko
aslesarenko approved these changes Feb 19, 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

@aslesarenko aslesarenko merged commit 1c81f6a into v2.0 Feb 19, 2019
@kushti kushti deleted the i324-methods-and-i344 branch May 28, 2019 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aslesarenko aslesarenko aslesarenko approved these 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.
2 participants
@greenhat @aslesarenko