From b400f48676bf18e961b00501fbfe7a4a93c4d570 Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Sun, 9 Nov 2025 23:49:48 -0800 Subject: [PATCH 1/3] Chained DotGet, meta.script.name. Doesn't work for numbers (row.2.1) yet --- src/compiler/compiler.ts | 33 ++++-- src/compiler/tests/compiler.test.ts | 37 +++++++ src/compiler/utils.ts | 6 +- src/parser/shrimp.grammar | 2 +- src/parser/shrimp.ts | 8 +- src/parser/tests/dot-get.test.ts | 150 ++++++++++++++++++++++++++++ src/parser/tokenizer.ts | 22 ++-- 7 files changed, 238 insertions(+), 20 deletions(-) diff --git a/src/compiler/compiler.ts b/src/compiler/compiler.ts index 3515ae2..6b98c1b 100644 --- a/src/compiler/compiler.ts +++ b/src/compiler/compiler.ts @@ -211,16 +211,37 @@ export class Compiler { } case terms.DotGet: { + // DotGet is parsed into a nested tree because it's hard to parse it into a flat one. + // However, we want a flat tree - so we're going to pretend like we are getting one from the parser. + // + // This: DotGet(config, DotGet(script, name)) + // Becomes: DotGet(config, script, name) const { objectName, property } = getDotGetParts(node, input) const instructions: ProgramItem[] = [] + instructions.push(['TRY_LOAD', objectName]) - if (property.type.id === terms.ParenExpr) { - instructions.push(...this.#compileNode(property, input)) - } else { - const propertyValue = input.slice(property.from, property.to) - instructions.push(['PUSH', propertyValue]) + + const flattenProperty = (prop: SyntaxNode): void => { + if (prop.type.id === terms.DotGet) { + const nestedParts = getDotGetParts(prop, input) + + const nestedObjectValue = input.slice(nestedParts.object.from, nestedParts.object.to) + instructions.push(['PUSH', nestedObjectValue]) + instructions.push(['DOT_GET']) + + flattenProperty(nestedParts.property) + } else { + if (prop.type.id === terms.ParenExpr) { + instructions.push(...this.#compileNode(prop, input)) + } else { + const propertyValue = input.slice(prop.from, prop.to) + instructions.push(['PUSH', propertyValue]) + } + instructions.push(['DOT_GET']) + } } - instructions.push(['DOT_GET']) + + flattenProperty(property) return instructions } diff --git a/src/compiler/tests/compiler.test.ts b/src/compiler/tests/compiler.test.ts index daecec8..bcddafb 100644 --- a/src/compiler/tests/compiler.test.ts +++ b/src/compiler/tests/compiler.test.ts @@ -294,6 +294,43 @@ describe('dot get', () => { test('use parens expr with dot-get', () => { expect(`a = 1; arr = array 'a' 'b' 'c'; arr.(1 + a)`).toEvaluateTo('c', { array }) }) + + test('chained dot get: two levels', () => { + expect(`obj = [inner=[value=42]]; obj.inner.value`).toEvaluateTo(42) + }) + + test('chained dot get: three levels', () => { + expect(`obj = [a=[b=[c=123]]]; obj.a.b.c`).toEvaluateTo(123) + }) + + test('chained dot get: four levels', () => { + expect(`obj = [w=[x=[y=[z='deep']]]]; obj.w.x.y.z`).toEvaluateTo('deep') + }) + + test('chained dot get with numeric index', () => { + expect(`obj = [items=[1 2 3]]; obj.items.0`).toEvaluateTo(1) + }) + + test('chained dot get in expression', () => { + expect(`config = [server=[port=3000]]; config.server.port + 1`).toEvaluateTo(3001) + }) + + test('chained dot get as function argument', () => { + const double = (x: number) => x * 2 + expect(`obj = [val=[num=21]]; double obj.val.num`).toEvaluateTo(42, { double }) + }) + + test('chained dot get in binary operation', () => { + expect(`a = [x=[y=10]]; b = [x=[y=20]]; a.x.y + b.x.y`).toEvaluateTo(30) + }) + + test('chained dot get with parens at end', () => { + expect(`idx = 1; obj = [items=[10 20 30]]; obj.items.(idx)`).toEvaluateTo(20) + }) + + test('mixed chained and simple dot get', () => { + expect(`obj = [a=1 b=[c=2]]; obj.a + obj.b.c`).toEvaluateTo(3) + }) }) describe('default params', () => { diff --git a/src/compiler/utils.ts b/src/compiler/utils.ts index c424be2..2aae236 100644 --- a/src/compiler/utils.ts +++ b/src/compiler/utils.ts @@ -301,9 +301,9 @@ export const getDotGetParts = (node: SyntaxNode, input: string) => { ) } - if (![terms.Identifier, terms.Number, terms.ParenExpr].includes(property.type.id)) { + if (![terms.Identifier, terms.Number, terms.ParenExpr, terms.DotGet].includes(property.type.id)) { throw new CompilerError( - `DotGet property must be an Identifier or Number, got ${property.type.name}`, + `DotGet property must be an Identifier, Number, ParenExpr, or DotGet, got ${property.type.name}`, property.from, property.to ) @@ -311,7 +311,7 @@ export const getDotGetParts = (node: SyntaxNode, input: string) => { const objectName = input.slice(object.from, object.to) - return { objectName, property } + return { object, objectName, property } } export const getTryExprParts = (node: SyntaxNode, input: string) => { diff --git a/src/parser/shrimp.grammar b/src/parser/shrimp.grammar index 80adcdb..b8aa46a 100644 --- a/src/parser/shrimp.grammar +++ b/src/parser/shrimp.grammar @@ -239,7 +239,7 @@ expression { @skip {} { DotGet { - IdentifierBeforeDot dot (Number | Identifier | ParenExpr) + IdentifierBeforeDot dot (DotGet | Number | Identifier | ParenExpr) } String { diff --git a/src/parser/shrimp.ts b/src/parser/shrimp.ts index 051f00e..b941d88 100644 --- a/src/parser/shrimp.ts +++ b/src/parser/shrimp.ts @@ -7,9 +7,9 @@ import {highlighting} from "./highlight" const spec_Identifier = {__proto__:null,while:78, null:112, catch:118, finally:124, end:126, if:134, else:140, try:158, throw:162, import:166} export const parser = LRParser.deserialize({ version: 14, - states: "=|QYQbOOO!mOpO'#DXO!rOSO'#D`OOQa'#D`'#D`O%mQcO'#DvO(mQcO'#EiOOQ`'#Ew'#EwO)WQRO'#DwO+]QcO'#EgO+vQbO'#DVOOQa'#Dy'#DyO.[QbO'#DzOOQa'#Ei'#EiO.cQcO'#EiO0aQcO'#EhO1fQcO'#EgO1sQRO'#ESOOQ`'#Eg'#EgO2[QbO'#EgO2cQQO'#EfOOQ`'#Ef'#EfOOQ`'#EU'#EUQYQbOOO2nQbO'#D[O2yQbO'#DpO3tQbO'#DSO4oQQO'#D|O3tQbO'#EOO4tQbO'#EQO4|ObO,59sO5XQbO'#DbO5aQWO'#DcOOOO'#Eo'#EoOOOO'#EZ'#EZO5uOSO,59zOOQa,59z,59zOOQ`'#DZ'#DZO6TQbO'#DoOOQ`'#Em'#EmOOQ`'#E^'#E^O6_QbO,5:^OOQa'#Eh'#EhO3tQbO,5:cO3tQbO,5:cO3tQbO,5:cO3tQbO,5:cO3tQbO,59pO3tQbO,59pO3tQbO,59pO3tQbO,59pOOQ`'#EW'#EWO+vQbO,59qO7XQcO'#DvO7`QcO'#EiO7gQRO,59qO7qQQO,59qO7vQQO,59qO8OQQO,59qO8ZQRO,59qO8sQRO,59qO8zQQO'#DQO9PQbO,5:fO9WQQO,5:eOOQa,5:f,5:fO9cQbO,5:fO9mQbO,5:oO9mQbO,5:nO:}QbO,5:gO;UQbO,59lOOQ`,5;Q,5;QO9mQbO'#EVOOQ`-E8S-E8SOOQ`'#EX'#EXO;pQbO'#D]O;{QbO'#D^OOQO'#EY'#EYO;sQQO'#D]O`QRO'#EvOOQO'#Ev'#EvO>gQQO,5:[O>lQRO,59nO>sQRO,59nO:}QbO,5:hO?RQcO,5:jO@aQcO,5:jO@}QcO,5:jOArQbO,5:lOOQ`'#Eb'#EbO4tQbO,5:lOOQa1G/_1G/_OOOO,59|,59|OOOO,59},59}OOOO-E8X-E8XOOQa1G/f1G/fOOQ`,5:Z,5:ZOOQ`-E8[-E8[OOQa1G/}1G/}OCkQcO1G/}OCuQcO1G/}OETQcO1G/}OE_QcO1G/}OElQcO1G/}OOQa1G/[1G/[OF}QcO1G/[OGUQcO1G/[OG]QcO1G/[OH[QcO1G/[OGdQcO1G/[OOQ`-E8U-E8UOHrQRO1G/]OH|QQO1G/]OIRQQO1G/]OIZQQO1G/]OIfQRO1G/]OImQRO1G/]OItQbO,59rOJOQQO1G/]OOQa1G/]1G/]OJWQQO1G0POOQa1G0Q1G0QOJcQbO1G0QOOQO'#E`'#E`OJWQQO1G0POOQa1G0P1G0POOQ`'#Ea'#EaOJcQbO1G0QOJmQbO1G0ZOKXQbO1G0YOKsQbO'#DjOLUQbO'#DjOLiQbO1G0ROOQ`-E8T-E8TOOQ`,5:q,5:qOOQ`-E8V-E8VOLtQQO,59wOOQO,59x,59xOOQO-E8W-E8WOL|QbO1G/bO:}QbO1G/vO:}QbO1G/YOMTQbO1G0SOM`QbO1G0WOM}QbO1G0WOOQ`-E8`-E8`ONUQQO7+$wOOQa7+$w7+$wON^QQO1G/^ONfQQO7+%kOOQa7+%k7+%kONqQbO7+%lOOQa7+%l7+%lOOQO-E8^-E8^OOQ`-E8_-E8_OOQ`'#E['#E[ON{QQO'#E[O! TQbO'#EuOOQ`,5:U,5:UO! hQbO'#DhO! mQQO'#DkOOQ`7+%m7+%mO! rQbO7+%mO! wQbO7+%mO!!PQbO7+$|O!!_QbO7+$|O!!oQbO7+%bO!!wQbO7+$tOOQ`7+%n7+%nO!!|QbO7+%nO!#RQbO7+%nO!#ZQbO7+%rOOQa<sAN>sOOQ`AN>SAN>SO!%zQbOAN>SO!&PQbOAN>SOOQ`-E8]-E8]OOQ`AN>hAN>hO!&XQbOAN>hO2yQbO,5:_O:}QbO,5:aOOQ`AN>tAN>tPItQbO'#EWOOQ`7+%Y7+%YOOQ`G23nG23nO!&^QbOG23nP!%^QbO'#DsOOQ`G24SG24SO!&cQQO1G/yOOQ`1G/{1G/{OOQ`LD)YLD)YO:}QbO7+%eOOQ`<cQRO'#EvOOQO'#Ev'#EvO>jQQO,5:[O>oQRO,59nO>vQRO,59nO;QQbO,5:hO?UQcO,5:jO@dQcO,5:jOAQQcO,5:jOAuQbO,5:lOOQ`'#Eb'#EbO4tQbO,5:lOOQa1G/_1G/_OOOO,59|,59|OOOO,59},59}OOOO-E8X-E8XOOQa1G/f1G/fOOQ`,5:Z,5:ZOOQ`-E8[-E8[OOQa1G/}1G/}OCnQcO1G/}OCxQcO1G/}OEWQcO1G/}OEbQcO1G/}OEoQcO1G/}OOQa1G/[1G/[OGQQcO1G/[OGXQcO1G/[OG`QcO1G/[OH_QcO1G/[OGgQcO1G/[OOQ`-E8U-E8UOHuQRO1G/]OIPQQO1G/]OIUQQO1G/]OI^QQO1G/]OIiQRO1G/]OIpQRO1G/]OIwQbO,59rOJRQQO1G/]OOQa1G/]1G/]OJZQQO1G0POOQa1G0Q1G0QOJfQbO1G0QOOQO'#E`'#E`OJZQQO1G0POOQa1G0P1G0POOQ`'#Ea'#EaOJfQbO1G0QOJpQbO1G0ZOK[QbO1G0YOKvQbO'#DjOLXQbO'#DjOLlQbO1G0ROOQ`-E8T-E8TOOQ`,5:q,5:qOOQ`-E8V-E8VOLwQQO,59wOOQO,59x,59xOOQO-E8W-E8WOMPQbO1G/bO;QQbO1G/vO;QQbO1G/YOMWQbO1G0SOMcQbO1G0WONQQbO1G0WOOQ`-E8`-E8`ONXQQO7+$wOOQa7+$w7+$wONaQQO1G/^ONiQQO7+%kOOQa7+%k7+%kONtQbO7+%lOOQa7+%l7+%lOOQO-E8^-E8^OOQ`-E8_-E8_OOQ`'#E['#E[O! OQQO'#E[O! WQbO'#EuOOQ`,5:U,5:UO! kQbO'#DhO! pQQO'#DkOOQ`7+%m7+%mO! uQbO7+%mO! zQbO7+%mO!!SQbO7+$|O!!bQbO7+$|O!!rQbO7+%bO!!zQbO7+$tOOQ`7+%n7+%nO!#PQbO7+%nO!#UQbO7+%nO!#^QbO7+%rOOQa<sAN>sOOQ`AN>SAN>SO!%}QbOAN>SO!&SQbOAN>SOOQ`-E8]-E8]OOQ`AN>hAN>hO!&[QbOAN>hO2yQbO,5:_O;QQbO,5:aOOQ`AN>tAN>tPIwQbO'#EWOOQ`7+%Y7+%YOOQ`G23nG23nO!&aQbOG23nP!%aQbO'#DsOOQ`G24SG24SO!&fQQO1G/yOOQ`1G/{1G/{OOQ`LD)YLD)YO;QQbO7+%eOOQ`< (specializeKeyword(value, stack) << 1), external: specializeKeyword},{term: 28, get: (value: keyof typeof spec_Identifier) => spec_Identifier[value] || -1}], - tokenPrec: 2370 + tokenPrec: 2373 }) diff --git a/src/parser/tests/dot-get.test.ts b/src/parser/tests/dot-get.test.ts index f781937..4181ce6 100644 --- a/src/parser/tests/dot-get.test.ts +++ b/src/parser/tests/dot-get.test.ts @@ -298,4 +298,154 @@ end`).toMatchTree(` Number 2 `) }) + + // NOTE: these are parsed as DotGet(meta, DotGet(script, name)) because that's easiest, + // but the compiler flattens them + test('chained dot get: meta.script.name', () => { + expect('meta = 42; meta.script.name').toMatchTree(` + Assign + AssignableIdentifier meta + Eq = + Number 42 + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot meta + DotGet + IdentifierBeforeDot script + Identifier name + `) + }) + + test('chained dot get: a.b.c.d', () => { + expect('a = 1; a.b.c.d').toMatchTree(` + Assign + AssignableIdentifier a + Eq = + Number 1 + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot a + DotGet + IdentifierBeforeDot b + DotGet + IdentifierBeforeDot c + Identifier d + `) + }) + + test('chained dot get in function call', () => { + expect('config = 1; echo config.db.host').toMatchTree(` + Assign + AssignableIdentifier config + Eq = + Number 1 + FunctionCall + Identifier echo + PositionalArg + DotGet + IdentifierBeforeDot config + DotGet + IdentifierBeforeDot db + Identifier host + `) + }) + + test('chained dot get with numeric index at end', () => { + expect('obj = 1; obj.items.0').toMatchTree(` + Assign + AssignableIdentifier obj + Eq = + Number 1 + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot obj + DotGet + IdentifierBeforeDot items + Number 0 + `) + }) + + test('chained dot get with ParenExpr at end', () => { + expect('obj = 1; obj.items.(i)').toMatchTree(` + Assign + AssignableIdentifier obj + Eq = + Number 1 + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot obj + DotGet + IdentifierBeforeDot items + ParenExpr + FunctionCallOrIdentifier + Identifier i + `) + }) + + test('not in scope remains Word with chained dots', () => { + expect('readme.md.bak').toMatchTree(`Word readme.md.bak`) + }) + + test('chained dot get in nested functions', () => { + expect(`do cfg: + do inner: + cfg.db.host + end +end`).toMatchTree(` + FunctionDef + Do do + Params + Identifier cfg + colon : + FunctionDef + Do do + Params + Identifier inner + colon : + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot cfg + DotGet + IdentifierBeforeDot db + Identifier host + keyword end + keyword end + `) + }) + + test('mixed simple and chained dot get', () => { + expect('obj = 1; obj.a; obj.b.c').toMatchTree(` + Assign + AssignableIdentifier obj + Eq = + Number 1 + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot obj + Identifier a + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot obj + DotGet + IdentifierBeforeDot b + Identifier c + `) + }) + + test.skip('chained numeric dot get: row.2.1.b', () => { + expect('row = []; row.2.1').toMatchTree(` + Assign + AssignableIdentifier row + Eq = + Array [] + FunctionCallOrIdentifier + DotGet + IdentifierBeforeDot row + DotGet + Number 2 + DotGet + Number 1 + Identifier b + `) + }) }) diff --git a/src/parser/tokenizer.ts b/src/parser/tokenizer.ts index 8ad55c2..75c027a 100644 --- a/src/parser/tokenizer.ts +++ b/src/parser/tokenizer.ts @@ -1,5 +1,5 @@ import { ExternalTokenizer, InputStream, Stack } from '@lezer/lr' -import { Identifier, AssignableIdentifier, Word, IdentifierBeforeDot, Do, CurlyString } from './shrimp.terms' +import { Identifier, AssignableIdentifier, Word, IdentifierBeforeDot, Do, CurlyString, DotGet } from './shrimp.terms' // doobie doobie do (we need the `do` keyword to know when we're defining params) export function specializeKeyword(ident: string) { @@ -187,11 +187,21 @@ const checkForDotGet = (input: InputStream, stack: Stack, pos: number): number | const identifierText = buildIdentifierText(input, pos) const context = stack.context as { scope: { has(name: string): boolean } } | undefined - // If identifier is in scope, this is property access (e.g., obj.prop) - // If not in scope, it should be consumed as a Word (e.g., file.txt) - return context?.scope.has(identifierText) || globals.includes(identifierText) - ? IdentifierBeforeDot - : null + // Check if identifier is in scope (lexical scope or globals) + const inScope = context?.scope.has(identifierText) || globals.includes(identifierText) + + // property access + if (inScope) return IdentifierBeforeDot + + // Not in scope - check if we're inside a DotGet chain + // Inside the @skip {} block where DotGet is defined, Word cannot be shifted + // but Identifier can be. This tells us we're at the RHS of a DotGet. + const canShiftIdentifier = stack.canShift(Identifier) + const canShiftWord = stack.canShift(Word) + const inDotGetChain = canShiftIdentifier && !canShiftWord + + // continue if we're inside a DotGet + return inDotGetChain ? IdentifierBeforeDot : null } // Decide between AssignableIdentifier and Identifier using grammar state + peek-ahead From c244435ae25776f7420d289ff49e4d309e119e8c Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Mon, 10 Nov 2025 00:53:16 -0800 Subject: [PATCH 2/3] add $. w/ shrimp runtime info --- bin/repl | 3 ++ bin/shrimp | 8 +++- src/compiler/utils.ts | 2 +- src/index.ts | 12 +++--- src/parser/shrimp.grammar | 6 ++- src/parser/shrimp.terms.ts | 69 ++++++++++++++++---------------- src/parser/shrimp.ts | 20 ++++----- src/parser/tests/dot-get.test.ts | 9 +++++ src/parser/tests/strings.test.ts | 9 +++-- src/prelude/index.ts | 16 +++++++- src/prelude/tests/info.test.ts | 43 ++++++++++++++++++-- 11 files changed, 135 insertions(+), 62 deletions(-) diff --git a/bin/repl b/bin/repl index 4cc5fd6..326d71a 100755 --- a/bin/repl +++ b/bin/repl @@ -7,6 +7,9 @@ import * as readline from 'readline' import { readFileSync, writeFileSync } from 'fs' import { basename } from 'path' +globals.$.script.name = '(repl)' +globals.$.script.path = '(repl)' + async function repl() { const commands = ['/clear', '/reset', '/vars', '/funcs', '/history', '/bytecode', '/exit', '/save', '/quit'] diff --git a/bin/shrimp b/bin/shrimp index fe856b3..04169bf 100755 --- a/bin/shrimp +++ b/bin/shrimp @@ -1,13 +1,17 @@ #!/usr/bin/env bun -import { colors } from '../src/prelude' +import { colors, globals as prelude } from '../src/prelude' import { treeToString } from '../src/utils/tree' import { runCode, runFile, compileFile, parseCode } from '../src' +import { resolve } from 'path' import { bytecodeToString } from 'reefvm' import { readFileSync } from 'fs' import { spawn } from 'child_process' import { join } from 'path' +const idx = Bun.argv.indexOf('--') +prelude.$.args = idx >= 0 ? Bun.argv.slice(idx + 1) : [] + function showHelp() { console.log(`${colors.bright}${colors.magenta}🦐 Shrimp${colors.reset} is a scripting language in a shell. @@ -149,10 +153,12 @@ async function main() { console.log(`${colors.bright}usage: shrimp run ${colors.reset}`) process.exit(1) } + prelude.$.script.path = resolve(file) await runFile(file) return } + prelude.$.script.path = resolve(command) await runFile(command) } diff --git a/src/compiler/utils.ts b/src/compiler/utils.ts index 2aae236..446aab3 100644 --- a/src/compiler/utils.ts +++ b/src/compiler/utils.ts @@ -293,7 +293,7 @@ export const getDotGetParts = (node: SyntaxNode, input: string) => { ) } - if (object.type.id !== terms.IdentifierBeforeDot) { + if (object.type.id !== terms.IdentifierBeforeDot && object.type.id !== terms.Dollar) { throw new CompilerError( `DotGet object must be an IdentifierBeforeDot, got ${object.type.name}`, object.from, diff --git a/src/index.ts b/src/index.ts index 687e513..47f5444 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,7 @@ import { type Tree } from '@lezer/common' import { Compiler } from '#compiler/compiler' import { parser } from '#parser/shrimp' import { globals as parserGlobals, setGlobals as setParserGlobals } from '#parser/tokenizer' -import { globals as shrimpGlobals } from '#prelude' +import { globals as prelude } from '#prelude' export { Compiler } from '#compiler/compiler' export { parser } from '#parser/shrimp' @@ -19,7 +19,7 @@ export class Shrimp { constructor(globals?: Record) { const emptyBytecode = { instructions: [], constants: [], labels: new Map() } - this.vm = new VM(emptyBytecode, Object.assign({}, shrimpGlobals, globals ?? {})) + this.vm = new VM(emptyBytecode, Object.assign({}, prelude, globals ?? {})) this.globals = globals } @@ -53,7 +53,7 @@ export class Shrimp { let bytecode if (typeof code === 'string') { - const compiler = new Compiler(code, Object.keys(Object.assign({}, shrimpGlobals, this.globals ?? {}, locals ?? {}))) + const compiler = new Compiler(code, Object.keys(Object.assign({}, prelude, this.globals ?? {}, locals ?? {}))) bytecode = compiler.bytecode } else { bytecode = code @@ -79,7 +79,7 @@ export async function runCode(code: string, globals?: Record): Prom } export async function runBytecode(bytecode: Bytecode, globals?: Record): Promise { - const vm = new VM(bytecode, Object.assign({}, shrimpGlobals, globals)) + const vm = new VM(bytecode, Object.assign({}, prelude, globals)) await vm.run() return vm.stack.length ? fromValue(vm.stack[vm.stack.length - 1]!, vm) : null } @@ -90,7 +90,7 @@ export function compileFile(path: string, globals?: Record): Byteco } export function compileCode(code: string, globals?: Record): Bytecode { - const globalNames = [...Object.keys(shrimpGlobals), ...(globals ? Object.keys(globals) : [])] + const globalNames = [...Object.keys(prelude), ...(globals ? Object.keys(globals) : [])] const compiler = new Compiler(code, globalNames) return compiler.bytecode } @@ -102,7 +102,7 @@ export function parseFile(path: string, globals?: Record): Tree { export function parseCode(code: string, globals?: Record): Tree { const oldGlobals = [...parserGlobals] - const globalNames = [...Object.keys(shrimpGlobals), ...(globals ? Object.keys(globals) : [])] + const globalNames = [...Object.keys(prelude), ...(globals ? Object.keys(globals) : [])] setParserGlobals(globalNames) const result = parser.parse(code) diff --git a/src/parser/shrimp.grammar b/src/parser/shrimp.grammar index b8aa46a..e8f2fa4 100644 --- a/src/parser/shrimp.grammar +++ b/src/parser/shrimp.grammar @@ -29,6 +29,7 @@ rightParen { ")" } colon[closedBy="end", @name="colon"] { ":" } Underscore { "_" } + Dollar { "$" } Regex { "//" (![/\\\n[] | "\\" ![\n] | "[" (![\n\\\]] | "\\" ![\n])* "]")+ ("//" $[gimsuy]*)? } // Stolen from the lezer JavaScript grammar "|"[@name=operator] } @@ -239,7 +240,8 @@ expression { @skip {} { DotGet { - IdentifierBeforeDot dot (DotGet | Number | Identifier | ParenExpr) + IdentifierBeforeDot dot (DotGet | Number | Identifier | ParenExpr) | + Dollar dot (DotGet | Number | Identifier | ParenExpr) } String { @@ -254,7 +256,7 @@ stringContent { } Interpolation { - "$" Identifier | + "$" FunctionCallOrIdentifier | "$" ParenExpr } diff --git a/src/parser/shrimp.terms.ts b/src/parser/shrimp.terms.ts index 0f3ba5b..2085974 100644 --- a/src/parser/shrimp.terms.ts +++ b/src/parser/shrimp.terms.ts @@ -37,42 +37,43 @@ export const Program = 35, PipeExpr = 36, WhileExpr = 38, - keyword = 83, + keyword = 84, ConditionalOp = 40, ParenExpr = 41, FunctionCallWithNewlines = 42, DotGet = 43, Number = 44, - PositionalArg = 45, - FunctionDef = 46, - Params = 47, - NamedParam = 48, - NamedArgPrefix = 49, - String = 50, - StringFragment = 51, - Interpolation = 52, - EscapeSeq = 53, - DoubleQuote = 54, - Boolean = 55, - Null = 56, - colon = 57, - CatchExpr = 58, - Block = 60, - FinallyExpr = 61, - Underscore = 64, - NamedArg = 65, - IfExpr = 66, - FunctionCall = 68, - ElseIfExpr = 69, - ElseExpr = 71, - FunctionCallOrIdentifier = 72, - BinOp = 73, - Regex = 74, - Dict = 75, - Array = 76, - FunctionCallWithBlock = 77, - TryExpr = 78, - Throw = 80, - Import = 82, - CompoundAssign = 84, - Assign = 85 + Dollar = 45, + PositionalArg = 46, + FunctionDef = 47, + Params = 48, + NamedParam = 49, + NamedArgPrefix = 50, + String = 51, + StringFragment = 52, + Interpolation = 53, + FunctionCallOrIdentifier = 54, + EscapeSeq = 55, + DoubleQuote = 56, + Boolean = 57, + Null = 58, + colon = 59, + CatchExpr = 60, + Block = 62, + FinallyExpr = 63, + Underscore = 66, + NamedArg = 67, + IfExpr = 68, + FunctionCall = 70, + ElseIfExpr = 71, + ElseExpr = 73, + BinOp = 74, + Regex = 75, + Dict = 76, + Array = 77, + FunctionCallWithBlock = 78, + TryExpr = 79, + Throw = 81, + Import = 83, + CompoundAssign = 85, + Assign = 86 diff --git a/src/parser/shrimp.ts b/src/parser/shrimp.ts index b941d88..8b7359e 100644 --- a/src/parser/shrimp.ts +++ b/src/parser/shrimp.ts @@ -4,24 +4,24 @@ import {operatorTokenizer} from "./operatorTokenizer" import {tokenizer, specializeKeyword} from "./tokenizer" import {trackScope} from "./parserScopeContext" import {highlighting} from "./highlight" -const spec_Identifier = {__proto__:null,while:78, null:112, catch:118, finally:124, end:126, if:134, else:140, try:158, throw:162, import:166} +const spec_Identifier = {__proto__:null,while:78, null:116, catch:122, finally:128, end:130, if:138, else:144, try:160, throw:164, import:168} export const parser = LRParser.deserialize({ version: 14, - states: "=|QYQbOOO!mOpO'#DXO!rOSO'#D`OOQa'#D`'#D`O%mQcO'#DvO(mQcO'#EiOOQ`'#Ew'#EwO)WQRO'#DwO+]QcO'#EgO+vQbO'#DVOOQa'#Dy'#DyO.[QbO'#DzOOQa'#Ei'#EiO.cQcO'#EiO0aQcO'#EhO1fQcO'#EgO1sQRO'#ESOOQ`'#Eg'#EgO2[QbO'#EgO2cQQO'#EfOOQ`'#Ef'#EfOOQ`'#EU'#EUQYQbOOO2nQbO'#D[O2yQbO'#DpO3tQbO'#DSO4oQQO'#D|O3tQbO'#EOO4tQbO'#EQO4|ObO,59sO5[QbO'#DbO5dQWO'#DcOOOO'#Eo'#EoOOOO'#EZ'#EZO5xOSO,59zOOQa,59z,59zOOQ`'#DZ'#DZO6WQbO'#DoOOQ`'#Em'#EmOOQ`'#E^'#E^O6bQbO,5:^OOQa'#Eh'#EhO3tQbO,5:cO3tQbO,5:cO3tQbO,5:cO3tQbO,5:cO3tQbO,59pO3tQbO,59pO3tQbO,59pO3tQbO,59pOOQ`'#EW'#EWO+vQbO,59qO7[QcO'#DvO7cQcO'#EiO7jQRO,59qO7tQQO,59qO7yQQO,59qO8RQQO,59qO8^QRO,59qO8vQRO,59qO8}QQO'#DQO9SQbO,5:fO9ZQQO,5:eOOQa,5:f,5:fO9fQbO,5:fO9pQbO,5:oO9pQbO,5:nO;QQbO,5:gO;XQbO,59lOOQ`,5;Q,5;QO9pQbO'#EVOOQ`-E8S-E8SOOQ`'#EX'#EXO;sQbO'#D]OcQRO'#EvOOQO'#Ev'#EvO>jQQO,5:[O>oQRO,59nO>vQRO,59nO;QQbO,5:hO?UQcO,5:jO@dQcO,5:jOAQQcO,5:jOAuQbO,5:lOOQ`'#Eb'#EbO4tQbO,5:lOOQa1G/_1G/_OOOO,59|,59|OOOO,59},59}OOOO-E8X-E8XOOQa1G/f1G/fOOQ`,5:Z,5:ZOOQ`-E8[-E8[OOQa1G/}1G/}OCnQcO1G/}OCxQcO1G/}OEWQcO1G/}OEbQcO1G/}OEoQcO1G/}OOQa1G/[1G/[OGQQcO1G/[OGXQcO1G/[OG`QcO1G/[OH_QcO1G/[OGgQcO1G/[OOQ`-E8U-E8UOHuQRO1G/]OIPQQO1G/]OIUQQO1G/]OI^QQO1G/]OIiQRO1G/]OIpQRO1G/]OIwQbO,59rOJRQQO1G/]OOQa1G/]1G/]OJZQQO1G0POOQa1G0Q1G0QOJfQbO1G0QOOQO'#E`'#E`OJZQQO1G0POOQa1G0P1G0POOQ`'#Ea'#EaOJfQbO1G0QOJpQbO1G0ZOK[QbO1G0YOKvQbO'#DjOLXQbO'#DjOLlQbO1G0ROOQ`-E8T-E8TOOQ`,5:q,5:qOOQ`-E8V-E8VOLwQQO,59wOOQO,59x,59xOOQO-E8W-E8WOMPQbO1G/bO;QQbO1G/vO;QQbO1G/YOMWQbO1G0SOMcQbO1G0WONQQbO1G0WOOQ`-E8`-E8`ONXQQO7+$wOOQa7+$w7+$wONaQQO1G/^ONiQQO7+%kOOQa7+%k7+%kONtQbO7+%lOOQa7+%l7+%lOOQO-E8^-E8^OOQ`-E8_-E8_OOQ`'#E['#E[O! OQQO'#E[O! WQbO'#EuOOQ`,5:U,5:UO! kQbO'#DhO! pQQO'#DkOOQ`7+%m7+%mO! uQbO7+%mO! zQbO7+%mO!!SQbO7+$|O!!bQbO7+$|O!!rQbO7+%bO!!zQbO7+$tOOQ`7+%n7+%nO!#PQbO7+%nO!#UQbO7+%nO!#^QbO7+%rOOQa<sAN>sOOQ`AN>SAN>SO!%}QbOAN>SO!&SQbOAN>SOOQ`-E8]-E8]OOQ`AN>hAN>hO!&[QbOAN>hO2yQbO,5:_O;QQbO,5:aOOQ`AN>tAN>tPIwQbO'#EWOOQ`7+%Y7+%YOOQ`G23nG23nO!&aQbOG23nP!%aQbO'#DsOOQ`G24SG24SO!&fQQO1G/yOOQ`1G/{1G/{OOQ`LD)YLD)YO;QQbO7+%eOOQ`<`QYQbOOO!pOpO'#DXO%eQcO'#DdO%{OSO'#DaOOQa'#Da'#DaO(vQcO'#EjOOQ`'#Ex'#ExO)aQRO'#DxO+fQcO'#EhO,PQbO'#DVOOQa'#Dz'#DzO.kQbO'#D{OOQa'#Ej'#EjO.rQcO'#EjO0pQcO'#EiO1uQcO'#EhO2SQRO'#ETOOQ`'#Eh'#EhO2kQbO'#EhO2rQQO'#EgOOQ`'#Eg'#EgOOQ`'#EV'#EVQYQbOOO2}QbO'#D]O3YQbO'#DrO4WQbO'#DSO5UQQO'#D}O4WQbO'#EPO5ZQbO'#ERO5cObO,59sOOQ`'#D['#D[O5tQbO'#DqOOQ`'#En'#EnOOQ`'#E_'#E_O6OQbO,5:`OOQa'#Ei'#EiO6xQbO'#DcO7WQWO'#DeOOOO'#Ep'#EpOOOO'#E['#E[O7lOSO,59{OOQa,59{,59{O4WQbO,5:dO4WQbO,5:dO4WQbO,5:dO4WQbO,5:dO4WQbO,59pO4WQbO,59pO4WQbO,59pO4WQbO,59pOOQ`'#EX'#EXO,PQbO,59qO7zQcO'#DdO8RQcO'#EjO8YQRO,59qO8dQQO,59qO8iQQO,59qO8qQQO,59qO8|QRO,59qO9fQRO,59qO9mQQO'#DQO9rQbO,5:gO9yQQO,5:fOOQa,5:g,5:gO:UQbO,5:gO:`QbO,5:pO:`QbO,5:oO;sQbO,5:hO;zQbO,59lOOQ`,5;R,5;RO:`QbO'#EWOOQ`-E8T-E8TOOQ`'#EY'#EYOXQRO'#EwO?UQRO'#EwOOQO'#Ew'#EwO?]QQO,5:^O?bQRO,59nO?iQRO,59nO;sQbO,5:iO?wQcO,5:kOAVQcO,5:kOAsQcO,5:kOBhQbO,5:mOOQ`'#Ec'#EcO5ZQbO,5:mOOQa1G/_1G/_OOQ`,5:],5:]OOQ`-E8]-E8]OOOO'#Dd'#DdOOOO,59},59}OOOO,5:P,5:POOOO-E8Y-E8YOOQa1G/g1G/gOOQa1G0O1G0OODaQcO1G0OODkQcO1G0OOEyQcO1G0OOFTQcO1G0OOFbQcO1G0OOOQa1G/[1G/[OGsQcO1G/[OGzQcO1G/[OHRQcO1G/[OIQQcO1G/[OHYQcO1G/[OOQ`-E8V-E8VOIhQRO1G/]OIrQQO1G/]OIwQQO1G/]OJPQQO1G/]OJ[QRO1G/]OJcQRO1G/]OJjQbO,59rOJtQQO1G/]OOQa1G/]1G/]OJ|QQO1G0QOOQa1G0R1G0ROKXQbO1G0ROOQO'#Ea'#EaOJ|QQO1G0QOOQa1G0Q1G0QOOQ`'#Eb'#EbOKXQbO1G0ROKcQbO1G0[OK}QbO1G0ZOLiQbO'#DlOLzQbO'#DlOM_QbO1G0SOOQ`-E8U-E8UOOQ`,5:r,5:rOOQ`-E8W-E8WOMjQQO,59xOOQO,59y,59yOOQO-E8X-E8XOMrQbO1G/cO;sQbO1G/xO;sQbO1G/YOMyQbO1G0TONUQbO1G0XONsQbO1G0XOOQ`-E8a-E8aONzQQO7+$wOOQa7+$w7+$wO! SQQO1G/^O! [QQO7+%lOOQa7+%l7+%lO! gQbO7+%mOOQa7+%m7+%mOOQO-E8_-E8_OOQ`-E8`-E8`OOQ`'#E]'#E]O! qQQO'#E]O! yQbO'#EvOOQ`,5:W,5:WO!!^QbO'#DjO!!cQQO'#DmOOQ`7+%n7+%nO!!hQbO7+%nO!!mQbO7+%nO!!uQbO7+$}O!#TQbO7+$}O!#eQbO7+%dO!#mQbO7+$tOOQ`7+%o7+%oO!#rQbO7+%oO!#wQbO7+%oO!$PQbO7+%sOOQa<tAN>tOOQ`AN>TAN>TO!&pQbOAN>TO!&uQbOAN>TOOQ`-E8^-E8^OOQ`AN>jAN>jO!&}QbOAN>jO3YQbO,5:aO;sQbO,5:cOOQ`AN>uAN>uPJjQbO'#EXOOQ`7+%[7+%[OOQ`G23oG23oO!'SQbOG23oP!&SQbO'#DuOOQ`G24UG24UO!'XQQO1G/{OOQ`1G/}1G/}OOQ`LD)ZLD)ZO;sQbO7+%gOOQ`<gO!]$SO~O!]$TO~P>gOT!POU!QOj!RO!]$TO~Ou!sa#`!sa#q!sa!_!sa!b!sa!c!sa#m!sa!j!sa~P)aOP{OQ{OR|OS|Od}Oe}Of}Og}Oh}Oi}O~Ou!sa#`!sa#q!sa!_!sa!b!sa!c!sa#m!sa!j!sa~P@eOT!POU!QOj!ROu!sa#`!sa#q!sa!_!sa!b!sa!c!sa#m!sa!j!sa~Ol!jO!SoOu!ua#`!ua#q!ua!_!ua!b!ua!c!ua#m!ua!j!ua~O^zOR!liS!lid!lie!lif!lig!lih!lii!liu!li#`!li#q!li#m!li!_!li!b!li!c!li!j!li~OP!liQ!li~PCYOP{OQ{O~PCYOP{OQ{Od!lie!lif!lig!lih!lii!liu!li#`!li#q!li#m!li!_!li!b!li!c!li!j!li~OR!liS!li~PDuOR|OS|O^zO~PDuOR|OS|O~PDuOW!OOX!OOY!OOZ!OO[!OO]!OOTxijxiuxi#`xi#qxi#mxi!]xi!_xi!bxi!cxi!jxi~OU!QO~PFlOU!QO~PGOOUxi~PFlOT!POU!QOjxiuxi#`xi#qxi#mxi!]xi!_xi!bxi!cxi!jxi~OW!OOX!OOY!OOZ!OO[!OO]!OO~PHYO#`!SO#m$ZO~P*qO#m$ZO~O#m$ZOu#[X~O!]!eO#m$ZOu#[X~O#m$ZO~P/]O#m$ZO~P9TOqgO!dnO~P-gO#`!SO#m$ZO~O!SoO#`#qO#p$^O~O#`#tO#p$`O~P4WOu!hO#`!xi#q!xi!_!xi!b!xi!c!xi#m!xi!j!xi~Ou!hO#`!wi#q!wi!_!wi!b!wi!c!wi#m!wi!j!wi~Ou!hO!_!`X!b!`X!c!`X!j!`X~O#`$cO!_#jP!b#jP!c#jP!j#jP~P:`O!_$gO!b$hO!c$iO~O!S!lO!]!Qa~O#`$mO~P:`O!_$gO!b$hO!c$pO~O!SoOu!ui#`!ui#q!ui!_!ui!b!ui!c!ui#m!ui!j!ui~Ol!jO~PNUO#`!SO#m$tO~O#`!SO#mzi~O!SoO#`#qO#p$wO~O#`#tO#p$xO~P4WOu!hO#`$yO~O#`$cO!_#jX!b#jX!c#jX!j#jX~P:`Ol${O~O!]$|O~O!c$}O~O!b$hO!c$}O~Ou!hO!_$gO!b$hO!c%PO~O#`$cO!_#jP!b#jP!c#jP~P:`O!c%WO!j%VO~O!c%YO~O!c%ZO~O!b$hO!c%ZO~O!SoOu!uq#`!uq#q!uq!_!uq!b!uq!c!uq#m!uq!j!uq~OqgO!dnO#mzq~P-gO#`!SO#mzq~O!]%`O~O!c%bO~O!c%cO~O!b$hO!c%cO~O!_$gO!b$hO!c%cO~O!c%gO!j%VO~O!]%jO!g%iO~O!c%gO~O!c%kO~OqgO!dnO#mzy~P-gO!c%nO~O!b$hO!c%nO~O!c%qO~O!c%tO~O!]%uO~Ol#OOo%xO|#OO}%xO#_XO~O#a%wO~O|!m~", + goto: "9g#mPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP#nP$XP$n%l&{'RPP(d(p)j)mP)sP*z+O*zPPPP+hP+t,^PPP,t#nP-f.PP.T.ZP/Q0U$X$XP$XP$XP$X$X1[1b1n2b2p2z3Q3X3_3i3o3y4TPPP4c4g5[7QPPP8[P8lPPPPP8p8v8|raOf!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uQ!YXR#g!TwaOXf!T!c!d!e!h!w#y$R$S$T$e$m$|%`%j%ur_Of!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uQ!]XS!qh%iQ!viQ!zkQ#^!QQ#`!PQ#c!RR#j!TvTOfh!c!d!e!h!w#y$R$S$T$e$m$|%`%i%j%u!W[QTZikorz{|}!O!P!Q!R!U!V!_!b!p#k#p#u$_$u%^%lS!VX!TS#Om%wR#StQ!XXR#f!TrQOf!c!d!e!h!w#y$R$S$T$e$m$|%`%j%u!WsQTZikorz{|}!O!P!Q!R!U!V!_!b!p#k#p#u$_$u%^%lS!UX!TS!ph%iS#Om%wR#RtepQTr!U!V!p#k$u%^%lraOf!c!d!e!h!w#y$R$S$T$e$m$|%`%j%udnQTr!U!V!p#k$u%^%lQ!YXQ#PoR#g!TR!ogX!mg!k!n$O#S[OQTXZfhikorz{|}!O!P!Q!R!T!U!V!_!b!c!d!e!h!p!w#k#p#u#y$R$S$T$_$e$m$u$|%^%`%i%j%l%uR$P!lTvRxvUOXf!T!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uR#StQ$k#zQ$r$UQ%R$lR%e%SQ#z!eQ$U!wQ$n$SQ$o$TQ%a$|Q%m%`Q%s%jR%v%uQ$j#zQ$q$UQ%O$kQ%Q$lQ%[$rS%d%R%SR%o%edpQTr!U!V!p#k$u%^%lQ!`Z[!|l!{!}$V$W$sQ#n!_X#q!`#n#r$]vUOXf!T!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uT!sh%iT%T$n%UQ%X$nR%h%UrWOf!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uQ!WXQ!ykQ#W{Q#Z|Q#]}R#e!T#T[OQTXZfhikorz{|}!O!P!Q!R!T!U!V!_!b!c!d!e!h!p!w#k#p#u#y$R$S$T$_$e$m$u$|%^%`%i%j%l%u![[QTZhikorz{|}!O!P!Q!R!U!V!_!b!p#k#p#u$_$u%^%i%lw]OXf!T!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uQfOR!if^!fc!^#v#w#x$d$lR#{!fQ!TXQ!_Z`#d!T!_#k#l$Y$u%^%lS#k!U!VS#l!W!]S$Y#e#jQ$u$[R%^$vQ!kgQ!{lU#}!k!{$WR$W!}Q!ngQ$O!kT$Q!n$OQxRR#UxS$e#y$mR$z$eQ$v$[R%_$vYrQT!U!V!pR#QrQ%U$nR%f%UQ#r!`Q$]#nT$a#r$]Q#u!bQ$_#pT$b#u$_Q!}lQ$V!{U$X!}$V$sR$s$WTeOfScOfS!^X!TQ#v!cQ#w!d`#x!e!w$S$T$|%`%j%uQ#|!hU$d#y$e$mR$l$RvVOXf!T!c!d!e!h!w#y$R$S$T$e$m$|%`%j%udnQTr!U!V!p#k$u%^%lQ!bZS!rh%iQ!uiQ!xkQ#PoQ#WzQ#X{Q#Y|Q#[}Q#^!OQ#_!PQ#a!QQ#b!RQ#p!_X#t!b#p#u$_r^Of!c!d!e!h!w#y$R$S$T$e$m$|%`%j%u![sQTZhikorz{|}!O!P!Q!R!U!V!_!b!p#k#p#u$_$u%^%i%lQ![XR#i!T[qQTr!U!V!pQ$[#kV%]$u%^%lTwRxQ$f#yR%S$mQ!thR%r%irbOf!c!d!e!h!w#y$R$S$T$e$m$|%`%j%uQ!ZXR#h!T", + nodeNames: "⚠ Star Slash Plus Minus And Or Eq EqEq Neq Lt Lte Gt Gte Modulo PlusEq MinusEq StarEq SlashEq ModuloEq Band Bor Bxor Shl Shr Ushr NullishCoalesce NullishEq Identifier AssignableIdentifier Word IdentifierBeforeDot CurlyString Do Comment Program PipeExpr operator WhileExpr keyword ConditionalOp ParenExpr FunctionCall DotGet Number Dollar PositionalArg FunctionDef Params NamedParam NamedArgPrefix String StringFragment Interpolation FunctionCallOrIdentifier EscapeSeq DoubleQuote Boolean Null colon CatchExpr keyword Block FinallyExpr keyword keyword Underscore NamedArg IfExpr keyword FunctionCall ElseIfExpr keyword ElseExpr BinOp Regex Dict Array FunctionCallWithBlock TryExpr keyword Throw keyword Import keyword CompoundAssign Assign", + maxTerm: 125, context: trackScope, nodeProps: [ - ["closedBy", 57,"end"] + ["closedBy", 59,"end"] ], propSources: [highlighting], skippedNodes: [0,34], repeatNodeCount: 13, - tokenData: "Lq~R!OOX$RXY$pYZ%ZZp$Rpq$pqr$Rrs%tst'ztu)cuw$Rwx)hxy)myz*Wz{$R{|*q|}$R}!O*q!O!P$R!P!Q4^!Q!R+c!R![.W![!]T!`#O$R#P;'S$R;'S;=`$j<%lO$RU>YV!TSOt$Ruw$Rx#O$R#P#Q>o#Q;'S$R;'S;=`$j<%lO$RU>vU#mQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~?_O#e~U?fU#oQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@PU!TS!bQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@h^!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$RUAkU!RQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RUBS_!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#UCR#U#o@c#o;'S$R;'S;=`$j<%lO$RUCW`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#`@c#`#aDY#a#o@c#o;'S$R;'S;=`$j<%lO$RUD_`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#g@c#g#hEa#h#o@c#o;'S$R;'S;=`$j<%lO$RUEf`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#X@c#X#YFh#Y#o@c#o;'S$R;'S;=`$j<%lO$RUFo^!XQ!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Gr^#fW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Hu^#hW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Ix`#gW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#f@c#f#gJz#g#o@c#o;'S$R;'S;=`$j<%lO$RUKP`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#i@c#i#jEa#j#o@c#o;'S$R;'S;=`$j<%lO$RULYUuQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~LqO#p~", - tokenizers: [operatorTokenizer, 1, 2, 3, tokenizer, new LocalTokenGroup("[~RP!O!PU~ZO#`~~", 11)], + tokenData: "Ls~R!OOX$RXY$pYZ%ZZp$Rpq$pqr$Rrs%tst'ztu)cuw$Rwx)jxy)oyz*Yz{$R{|*s|}$R}!O*s!O!P$R!P!Q4`!Q!R+e!R![.Y![!]<{!]!^%Z!^!}$R!}#O=f#O#P?[#P#Q?a#Q#R$R#R#S?z#S#T$R#T#Y@e#Y#ZBP#Z#b@e#b#cGm#c#f@e#f#gHp#g#h@e#h#iIs#i#o@e#o#p$R#p#qLT#q;'S$R;'S;=`$j<%l~$R~O$R~~LnS$WU!USOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RS$mP;=`<%l$R^$wU!US#YYOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%bU!US#`QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%yZ!USOr%trs&lst%ttu'Vuw%twx'Vx#O%t#O#P'V#P;'S%t;'S;=`'t<%lO%tU&sU!YQ!USOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RQ'YTOr'Vrs'is;'S'V;'S;=`'n<%lO'VQ'nO!YQQ'qP;=`<%l'VU'wP;=`<%l%t^(RZrY!USOY'zYZ$RZt'ztu(tuw'zwx(tx#O'z#O#P(t#P;'S'z;'S;=`)]<%lO'zY(ySrYOY(tZ;'S(t;'S;=`)V<%lO(tY)YP;=`<%l(t^)`P;=`<%l'z^)jO#e[}Q~)oO#c~U)vU!US#_QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*aU!US#mQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*xX!USOt$Ruw$Rx!Q$R!Q!R+e!R![.Y![#O$R#P;'S$R;'S;=`$j<%lO$RU+lb!US|QOt$Ruw$Rx!O$R!O!P,t!P!Q$R!Q![.Y![#O$R#P#R$R#R#S/V#S#U$R#U#V/t#V#c$R#c#d1Y#d#l$R#l#m2h#m;'S$R;'S;=`$j<%lO$RU,yW!USOt$Ruw$Rx!Q$R!Q![-c![#O$R#P;'S$R;'S;=`$j<%lO$RU-jY!US|QOt$Ruw$Rx!Q$R!Q![-c![#O$R#P#R$R#R#S,t#S;'S$R;'S;=`$j<%lO$RU.a[!US|QOt$Ruw$Rx!O$R!O!P,t!P!Q$R!Q![.Y![#O$R#P#R$R#R#S/V#S;'S$R;'S;=`$j<%lO$RU/[W!USOt$Ruw$Rx!Q$R!Q![.Y![#O$R#P;'S$R;'S;=`$j<%lO$RU/yX!USOt$Ruw$Rx!Q$R!Q!R0f!R!S0f!S#O$R#P;'S$R;'S;=`$j<%lO$RU0mX!US|QOt$Ruw$Rx!Q$R!Q!R0f!R!S0f!S#O$R#P;'S$R;'S;=`$j<%lO$RU1_W!USOt$Ruw$Rx!Q$R!Q!Y1w!Y#O$R#P;'S$R;'S;=`$j<%lO$RU2OW!US|QOt$Ruw$Rx!Q$R!Q!Y1w!Y#O$R#P;'S$R;'S;=`$j<%lO$RU2m[!USOt$Ruw$Rx!Q$R!Q![3c![!c$R!c!i3c!i#O$R#P#T$R#T#Z3c#Z;'S$R;'S;=`$j<%lO$RU3j[!US|QOt$Ruw$Rx!Q$R!Q![3c![!c$R!c!i3c!i#O$R#P#T$R#T#Z3c#Z;'S$R;'S;=`$j<%lO$RU4eW!USOt$Ruw$Rx!P$R!P!Q4}!Q#O$R#P;'S$R;'S;=`$j<%lO$RU5S^!USOY6OYZ$RZt6Otu7Ruw6Owx7Rx!P6O!P!Q$R!Q!}6O!}#O;t#O#P9a#P;'S6O;'S;=`V!`#O$R#P;'S$R;'S;=`$j<%lO$RU>[V!USOt$Ruw$Rx#O$R#P#Q>q#Q;'S$R;'S;=`$j<%lO$RU>xU#nQ!USOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~?aO#f~U?hU#pQ!USOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@RU!US!dQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@j^!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#o@e#o;'S$R;'S;=`$j<%lO$RUAmU!SQ!USOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RUBU_!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#UCT#U#o@e#o;'S$R;'S;=`$j<%lO$RUCY`!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#`@e#`#aD[#a#o@e#o;'S$R;'S;=`$j<%lO$RUDa`!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#g@e#g#hEc#h#o@e#o;'S$R;'S;=`$j<%lO$RUEh`!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#X@e#X#YFj#Y#o@e#o;'S$R;'S;=`$j<%lO$RUFq^!ZQ!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#o@e#o;'S$R;'S;=`$j<%lO$R^Gt^#gW!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#o@e#o;'S$R;'S;=`$j<%lO$R^Hw^#iW!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#o@e#o;'S$R;'S;=`$j<%lO$R^Iz`#hW!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#f@e#f#gJ|#g#o@e#o;'S$R;'S;=`$j<%lO$RUKR`!USOt$Ruw$Rx}$R}!O@e!O!Q$R!Q![@e![!_$R!_!`Af!`#O$R#P#T$R#T#i@e#i#jEc#j#o@e#o;'S$R;'S;=`$j<%lO$RUL[UuQ!USOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~LsO#q~", + tokenizers: [operatorTokenizer, 1, 2, 3, tokenizer, new LocalTokenGroup("[~RP!O!PU~ZO#a~~", 11)], topRules: {"Program":[0,35]}, specialized: [{term: 28, get: (value: any, stack: any) => (specializeKeyword(value, stack) << 1), external: specializeKeyword},{term: 28, get: (value: keyof typeof spec_Identifier) => spec_Identifier[value] || -1}], - tokenPrec: 2373 + tokenPrec: 2428 }) diff --git a/src/parser/tests/dot-get.test.ts b/src/parser/tests/dot-get.test.ts index 4181ce6..fbcdb26 100644 --- a/src/parser/tests/dot-get.test.ts +++ b/src/parser/tests/dot-get.test.ts @@ -447,5 +447,14 @@ end`).toMatchTree(` Number 1 Identifier b `) + + test('parses $.pid just fine', () => { + expect(`$.pid`).toMatchTree(` + FunctionCallOrIdentifier + DotGet + Dollar $ + Identifier pid + `) + }) }) }) diff --git a/src/parser/tests/strings.test.ts b/src/parser/tests/strings.test.ts index 7b4a672..01fd0ac 100644 --- a/src/parser/tests/strings.test.ts +++ b/src/parser/tests/strings.test.ts @@ -8,7 +8,8 @@ describe('string interpolation', () => { String StringFragment ${'hello '} Interpolation - Identifier name + FunctionCallOrIdentifier + Identifier name `) }) @@ -44,7 +45,8 @@ describe('string interpolation', () => { String StringFragment x/ Interpolation - Identifier y + FunctionCallOrIdentifier + Identifier y StringFragment /z `) }) @@ -122,7 +124,8 @@ describe('string escape sequences', () => { String StringFragment value: Interpolation - Identifier x + FunctionCallOrIdentifier + Identifier x EscapeSeq \\n `) }) diff --git a/src/prelude/index.ts b/src/prelude/index.ts index 8233834..78c1355 100644 --- a/src/prelude/index.ts +++ b/src/prelude/index.ts @@ -1,5 +1,6 @@ // The prelude creates all the builtin Shrimp functions. +import { join, resolve } from 'path' import { type Value, type VM, toValue, extractParamInfo, isWrapped, getOriginalFunction, @@ -22,6 +23,20 @@ export const globals = { math, str, + // shrimp runtime info + $: { + args: Bun.argv.slice(3), + argv: Bun.argv.slice(1), + env: process.env, + pid: process.pid, + cwd: process.env.PWD, + script: { + name: Bun.argv[2] || '(shrimp)', + path: resolve(join('.', Bun.argv[2] ?? '')) + }, + + }, + // hello echo: (...args: any[]) => { console.log(...args.map(a => { @@ -66,7 +81,6 @@ export const globals = { }, // env - args: Bun.argv.slice(1), exit: (num: number) => process.exit(num ?? 0), // type predicates diff --git a/src/prelude/tests/info.test.ts b/src/prelude/tests/info.test.ts index 39e2545..ce97a35 100644 --- a/src/prelude/tests/info.test.ts +++ b/src/prelude/tests/info.test.ts @@ -80,15 +80,15 @@ describe('introspection', () => { describe('environment', () => { test('args is an array', async () => { - await expect(`array? args`).toEvaluateTo(true, globals) + await expect(`array? $.args`).toEvaluateTo(true, globals) }) test('args can be accessed', async () => { - await expect(`type args`).toEvaluateTo('array', globals) + await expect(`type $.args`).toEvaluateTo('array', globals) }) - test('', async () => { - await expect(`list.first args | str.ends-with? 'shrimp.test.ts'`).toEvaluateTo(true) + test('argv includes more than just the args', async () => { + await expect(`list.first $.argv | str.ends-with? 'shrimp.test.ts'`).toEvaluateTo(true) }) }) @@ -103,3 +103,38 @@ describe('ref', () => { expect(`rnd = ref math.random; rnd | type`).toEvaluateTo('number') expect(`rnd = ref math.random; ref rnd | type`).toEvaluateTo('native') }) + +describe('$ global dictionary', () => { + test('$.args is an array', async () => { + await expect(`$.args | array?`).toEvaluateTo(true, globals) + }) + + test('$.args can be accessed', async () => { + await expect(`$.args | type`).toEvaluateTo('array', globals) + }) + + test('$.script.name is a string', async () => { + await expect(`$.script.name | string?`).toEvaluateTo(true, globals) + }) + + test('$.script.path is a string', async () => { + await expect(`$.script.path | string?`).toEvaluateTo(true, globals) + }) + + test('$.env is a dict', async () => { + await expect(`$.env | dict?`).toEvaluateTo(true, globals) + }) + + test('$.pid is a number', async () => { + await expect(`$.pid | number?`).toEvaluateTo(true, globals) + await expect(`$.pid > 0`).toEvaluateTo(true, globals) + }) + + test('$.cwd is a string', async () => { + await expect(`$.cwd | string?`).toEvaluateTo(true, globals) + }) + + test('$.cwd returns current working directory', async () => { + await expect(`$.cwd`).toEvaluateTo(process.cwd(), globals) + }) +}) From 0c6ce16bcde8631f880f0570ffcb3e8e97fa1856 Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Mon, 10 Nov 2025 01:00:33 -0800 Subject: [PATCH 3/3] not always --- bin/shrimp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/shrimp b/bin/shrimp index 04169bf..6e5d502 100755 --- a/bin/shrimp +++ b/bin/shrimp @@ -9,9 +9,6 @@ import { readFileSync } from 'fs' import { spawn } from 'child_process' import { join } from 'path' -const idx = Bun.argv.indexOf('--') -prelude.$.args = idx >= 0 ? Bun.argv.slice(idx + 1) : [] - function showHelp() { console.log(`${colors.bright}${colors.magenta}🦐 Shrimp${colors.reset} is a scripting language in a shell. @@ -38,6 +35,9 @@ function showVersion() { } async function evalCode(code: string, imports: string[]) { + const idx = Bun.argv.indexOf('--') + prelude.$.args = idx >= 0 ? Bun.argv.slice(idx + 1) : [] + const importStatement = imports.length > 0 ? `import ${imports.join(' ')}` : '' if (importStatement) code = `${importStatement}; ${code}` return await runCode(code)