Another one.

This commit is contained in:
2025-08-27 01:29:54 -04:00
parent 7cad33405e
commit 542d36f266
4 changed files with 4254 additions and 1008 deletions

View File

@@ -7,78 +7,64 @@
/// <reference types="tree-sitter-cli/dsl" />
// @ts-check
// grammar.js
const PREC = {
assign: 0, // right-assoc
add: 1, // left-assoc
mul: 2, // left-assoc
call: 3,
funcdef: 4,
lambda: 5,
};
module.exports = grammar({
name: "scl",
// Whitespace is of no consequence.
extras: ($) => [/\s/],
conflicts: ($) => [[$.params, $._exp]],
rules: {
// A file is zero or more expressions.
source_file: ($) => repeat($._exp),
// Everything is expressions. Makes this a lot easier.
_exp: ($) =>
choice(
$.num,
$.bool,
$.word,
$.binexp,
$.callexp,
$.funcdef,
$.lambda,
$.vardef,
$.parexp,
$.block,
$.vardef,
$.lambda,
$.funcdef,
$.ifexp,
),
// Literals / identifiers.
num: (_) => /\d+/,
bool: (_) => choice("TRUE", "T", "FALSE", "F"),
word: (_) => /[a-zA-Z_]\w*/,
// Binary expressions with precedence and left associativity.
binexp: ($) =>
choice(
prec.left(
PREC.add,
1,
seq(
field("left", $._exp),
field("op", choice("+", "-")),
field("op", choice("+", "-", "*", "/", "eq")),
field("right", $._exp),
),
),
prec.left(
PREC.mul,
seq(
field("left", $._exp),
field("op", choice("*", "/")),
field("right", $._exp),
),
),
),
// Function call: prefer this over plain `word` via precedence.
callexp: ($) =>
prec(
PREC.call,
prec.left(
1, // lower than funcdef
seq(field("fn", $.word), "(", optional(commaSep($._exp)), ")"),
),
// Convenient function definition (sugar): `f(x, y, ...) body`.
// Give it higher precedence than calls to resolve the shared prefix.
parexp: ($) => seq("(", $._exp, ")"),
block: ($) => seq("{", repeat($._exp), "}"),
vardef: ($) =>
prec.right(1, seq(field("name", $.word), "=", field("value", $._exp))),
lambda: ($) =>
prec.right(
2,
seq("\\", field("params", $.params), field("body", $._exp)),
),
funcdef: ($) =>
prec(
PREC.funcdef,
prec.right(
3, // higher precedence than call
seq(
field("name", $.word),
field("params", $.params),
@@ -86,26 +72,33 @@ module.exports = grammar({
),
),
// Lambda: `\(x, y, ...) body`.
lambda: ($) =>
prec(
PREC.lambda,
seq("\\", field("params", $.params), field("body", $._exp)),
),
// Variable definition / assignment: `x = expr`.
// Lowest precedence, right-associative: `a = b = c` → `a = (b = c)`.
vardef: ($) =>
prec.right(
PREC.assign,
seq(field("name", $.word), "=", field("value", $._exp)),
),
// Parameter list node used by funcdef and lambda.
params: ($) => seq("(", optional(commaSep($.word)), ")"),
// Parenthesized expression.
parexp: ($) => seq("(", $._exp, ")"),
ifexp: ($) =>
choice(
seq(
"_if",
"(",
field("cond", $._exp),
",",
field("then", $._exp),
",",
field("else", $._exp),
")",
),
seq(
"if",
field("cond", $._exp),
field("then", $._exp),
choice(seq("else", field("else", $._exp)), field("else", $._exp)),
),
seq(
"?",
field("cond", $._exp),
field("then", $._exp),
field("else", $._exp),
),
),
},
});

284
src/grammar.json generated
View File

@@ -16,6 +16,10 @@
"type": "SYMBOL",
"name": "num"
},
{
"type": "SYMBOL",
"name": "bool"
},
{
"type": "SYMBOL",
"name": "word"
@@ -30,11 +34,11 @@
},
{
"type": "SYMBOL",
"name": "funcdef"
"name": "parexp"
},
{
"type": "SYMBOL",
"name": "lambda"
"name": "block"
},
{
"type": "SYMBOL",
@@ -42,7 +46,15 @@
},
{
"type": "SYMBOL",
"name": "parexp"
"name": "lambda"
},
{
"type": "SYMBOL",
"name": "funcdef"
},
{
"type": "SYMBOL",
"name": "ifexp"
}
]
},
@@ -50,14 +62,32 @@
"type": "PATTERN",
"value": "\\d+"
},
"bool": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "TRUE"
},
{
"type": "STRING",
"value": "T"
},
{
"type": "STRING",
"value": "FALSE"
},
{
"type": "STRING",
"value": "F"
}
]
},
"word": {
"type": "PATTERN",
"value": "[a-zA-Z_]\\w*"
},
"binexp": {
"type": "CHOICE",
"members": [
{
"type": "PREC_LEFT",
"value": 1,
"content": {
@@ -84,41 +114,7 @@
{
"type": "STRING",
"value": "-"
}
]
}
},
{
"type": "FIELD",
"name": "right",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
}
]
}
},
{
"type": "PREC_LEFT",
"value": 2,
"content": {
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "left",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "FIELD",
"name": "op",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "*"
@@ -126,6 +122,10 @@
{
"type": "STRING",
"value": "/"
},
{
"type": "STRING",
"value": "eq"
}
]
}
@@ -140,12 +140,10 @@
}
]
}
}
]
},
"callexp": {
"type": "PREC",
"value": 3,
"type": "PREC_LEFT",
"value": 1,
"content": {
"type": "SEQ",
"members": [
@@ -201,9 +199,46 @@
]
}
},
"funcdef": {
"type": "PREC",
"value": 4,
"parexp": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{
"type": "SYMBOL",
"name": "_exp"
},
{
"type": "STRING",
"value": ")"
}
]
},
"block": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "{"
},
{
"type": "REPEAT",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "STRING",
"value": "}"
}
]
},
"vardef": {
"type": "PREC_RIGHT",
"value": 1,
"content": {
"type": "SEQ",
"members": [
@@ -216,16 +251,12 @@
}
},
{
"type": "FIELD",
"name": "params",
"content": {
"type": "SYMBOL",
"name": "params"
}
"type": "STRING",
"value": "="
},
{
"type": "FIELD",
"name": "body",
"name": "value",
"content": {
"type": "SYMBOL",
"name": "_exp"
@@ -235,8 +266,8 @@
}
},
"lambda": {
"type": "PREC",
"value": 5,
"type": "PREC_RIGHT",
"value": 2,
"content": {
"type": "SEQ",
"members": [
@@ -263,9 +294,9 @@
]
}
},
"vardef": {
"funcdef": {
"type": "PREC_RIGHT",
"value": 0,
"value": 3,
"content": {
"type": "SEQ",
"members": [
@@ -278,12 +309,16 @@
}
},
{
"type": "STRING",
"value": "="
"type": "FIELD",
"name": "params",
"content": {
"type": "SYMBOL",
"name": "params"
}
},
{
"type": "FIELD",
"name": "value",
"name": "body",
"content": {
"type": "SYMBOL",
"name": "_exp"
@@ -338,22 +373,147 @@
}
]
},
"parexp": {
"ifexp": {
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "_if"
},
{
"type": "STRING",
"value": "("
},
{
"type": "FIELD",
"name": "cond",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "STRING",
"value": ","
},
{
"type": "FIELD",
"name": "then",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "STRING",
"value": ","
},
{
"type": "FIELD",
"name": "else",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "STRING",
"value": ")"
}
]
},
{
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "if"
},
{
"type": "FIELD",
"name": "cond",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "FIELD",
"name": "then",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "else"
},
{
"type": "FIELD",
"name": "else",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
}
]
},
{
"type": "FIELD",
"name": "else",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
}
]
}
]
},
{
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "?"
},
{
"type": "FIELD",
"name": "cond",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "FIELD",
"name": "then",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
},
{
"type": "FIELD",
"name": "else",
"content": {
"type": "SYMBOL",
"name": "_exp"
}
}
]
}
]
}
},
"extras": [

360
src/node-types.json generated
View File

@@ -11,6 +11,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -19,6 +27,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -60,6 +72,10 @@
{
"type": "/",
"named": false
},
{
"type": "eq",
"named": false
}
]
},
@@ -71,6 +87,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -79,6 +103,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -103,6 +131,66 @@
}
}
},
{
"type": "block",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
},
{
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
},
{
"type": "num",
"named": true
},
{
"type": "parexp",
"named": true
},
{
"type": "vardef",
"named": true
},
{
"type": "word",
"named": true
}
]
}
},
{
"type": "bool",
"named": true,
"fields": {}
},
{
"type": "callexp",
"named": true,
@@ -126,6 +214,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -134,6 +230,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -169,6 +269,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -177,6 +285,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -221,6 +333,162 @@
}
}
},
{
"type": "ifexp",
"named": true,
"fields": {
"cond": {
"multiple": false,
"required": true,
"types": [
{
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
},
{
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
},
{
"type": "num",
"named": true
},
{
"type": "parexp",
"named": true
},
{
"type": "vardef",
"named": true
},
{
"type": "word",
"named": true
}
]
},
"else": {
"multiple": false,
"required": true,
"types": [
{
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
},
{
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
},
{
"type": "num",
"named": true
},
{
"type": "parexp",
"named": true
},
{
"type": "vardef",
"named": true
},
{
"type": "word",
"named": true
}
]
},
"then": {
"multiple": false,
"required": true,
"types": [
{
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
},
{
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
},
{
"type": "num",
"named": true
},
{
"type": "parexp",
"named": true
},
{
"type": "vardef",
"named": true
},
{
"type": "word",
"named": true
}
]
}
}
},
{
"type": "lambda",
"named": true,
@@ -233,6 +501,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -241,6 +517,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -302,6 +582,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -310,6 +598,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -346,6 +638,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -354,6 +654,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -399,6 +703,14 @@
"type": "binexp",
"named": true
},
{
"type": "block",
"named": true
},
{
"type": "bool",
"named": true
},
{
"type": "callexp",
"named": true
@@ -407,6 +719,10 @@
"type": "funcdef",
"named": true
},
{
"type": "ifexp",
"named": true
},
{
"type": "lambda",
"named": true
@@ -463,10 +779,46 @@
"type": "=",
"named": false
},
{
"type": "?",
"named": false
},
{
"type": "F",
"named": false
},
{
"type": "FALSE",
"named": false
},
{
"type": "T",
"named": false
},
{
"type": "TRUE",
"named": false
},
{
"type": "\\",
"named": false
},
{
"type": "_if",
"named": false
},
{
"type": "else",
"named": false
},
{
"type": "eq",
"named": false
},
{
"type": "if",
"named": false
},
{
"type": "num",
"named": true
@@ -474,5 +826,13 @@
{
"type": "word",
"named": true
},
{
"type": "{",
"named": false
},
{
"type": "}",
"named": false
}
]

4397
src/parser.c generated

File diff suppressed because it is too large Load Diff