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

Towards a full-blown builtins DSL (part 3) #3471

Merged
merged 20 commits into from
Jun 13, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@
builtins from method signatures][3454]
- [Avoid needless concatenations of warning/error messages][3465]
- [Lazy evaluation of RHS argument for || and &&][3492]
- [Towards full-blown DSL for builtins][3471]

[3227]: https://github.com/enso-org/enso/pull/3227
[3248]: https://github.com/enso-org/enso/pull/3248
Expand All @@ -252,6 +253,7 @@
[3454]: https://github.com/enso-org/enso/pull/3454
[3461]: https://github.com/enso-org/enso/pull/3461
[3465]: https://github.com/enso-org/enso/pull/3465
[3471]: https://github.com/enso-org/enso/pull/3471
[3492]: https://github.com/enso-org/enso/pull/3492
[3493]: https://github.com/enso-org/enso/pull/3493
[3505]: https://github.com/enso-org/enso/pull/3505
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,8 @@ lazy val `interpreter-dsl` = (project in file("lib/scala/interpreter-dsl"))
Seq("-processor", "org.netbeans.modules.openide.util.ServiceProviderProcessor")),
libraryDependencies ++= Seq(
"org.apache.commons" % "commons-lang3" % commonsLangVersion,
"org.netbeans.api" % "org-openide-util-lookup" % "RELEASE130"
"org.netbeans.api" % "org-openide-util-lookup" % "RELEASE130",
"com.google.guava" % "guava" % guavaVersion exclude ("com.google.code.findbugs", "jsr305"),
)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

Forces flattening of a text value.
optimize : Text
optimize = @Builtin_Method "Prim_Text_Helpers.optimize"
optimize = @Builtin_Method "Prim_Text_Helper.optimize"
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Project_Description

Enso_Project.root
root : File.File
root = File.new this.prim_root_file.getPath
root = File.new this.prim_root_file

## Returns the root data directory of the project.

Expand Down
2 changes: 1 addition & 1 deletion distribution/lib/Standard/Base/0.0.0-dev/src/System.enso
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ create_process command arguments input redirect_in redirect_out redirect_err = @
- code: The numerical exit code for the Enso program.

> Example
Exit the enso program with a failure.
Exit the Enso program with a failure.

System.exit 42
exit : Integer -> Nothing
Expand Down
Loading