Skip to content

Commit

Permalink
Merge pull request #48 from fink-lang/lang
Browse files Browse the repository at this point in the history
features, cleanups
  • Loading branch information
kollhof authored May 4, 2020
2 parents faebbb6 + 4ff9144 commit 85da1bf
Show file tree
Hide file tree
Showing 92 changed files with 1,829 additions and 1,622 deletions.
39 changes: 39 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Jest All",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["--runInBand"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"sourceMaps": true,
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest",
}
},
{
"type": "node",
"request": "launch",
"name": "Jest Current File",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": [
"--runInBand",
"${relativeFile}"
],
"sourceMaps": true,
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest",
}
}
]
}
139 changes: 90 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
"release": "semantic-release"
},
"dependencies": {
"@fink/prattler": "^3.0.1"
"@fink/prattler": "^4.0.0"
},
"devDependencies": {
"@fink/cli": "^3.1.0",
"@fink/jest": "^2.0.0",
"@fink/jest": "^3.0.0",
"@fink/larix": "^7.0.0",
"@fink/loxia": "^6.0.0",
"commitizen": "^4.0.5",
"cz-conventional-changelog": "^3.1.0",
"jest-cli": "^25.5.3",
"jest-cli": "^25.5.4",
"npx-run": "^2.1.2",
"semantic-release": "^17.0.7"
},
Expand Down
10 changes: 4 additions & 6 deletions src/index.fnk
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ init = fn ctx:


parse_expr = fn code, filename:
ctx = init:: {code, filename}
[expr] = single_expression:: ctx, 0
expr
ctx = init {code, filename}
single_expression ctx, 0


parse = fn code, filename:
ctx = init:: {code, filename}
[ast] = parse_module:: ctx
ast
ctx = init {code, filename}
parse_module ctx

Loading

0 comments on commit 85da1bf

Please sign in to comment.