feat: complete density functions

Author: ItsMeBrianD

.helix/languages.toml

@@ -0,0 +1,11 @@
+[language-server.mms-lsp]
+command = "go"
+args = ["run", "main.go", "lsp"]
+
+[[language]]
+name = "mms"
+scope = "source.mms"
+injection-regex = "mms"
+file-types = ["mms"]
+comment-tokens = "#"
+language-servers = [ "mms-lsp" ]

go.mod

@@ -5,10 +5,29 @@ go 1.23
 require (
 	github.com/antlr4-go/antlr/v4 v4.13.1
 	github.com/spf13/cobra v1.9.1
+	github.com/tliron/glsp v0.2.2
 )
 
 require (
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/muesli/termenv v0.15.2 // indirect
+	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/sasha-s/go-deadlock v0.3.1 // indirect
+	github.com/sourcegraph/jsonrpc2 v0.2.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/tliron/commonlog v0.2.8 // indirect
+	github.com/tliron/kutil v0.3.11 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.14.0 // indirect
 )

go.sum

@@ -1,14 +1,54 @@
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
+github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
+github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
+github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
+github.com/sourcegraph/jsonrpc2 v0.2.0 h1:KjN/dC4fP6aN9030MZCJs9WQbTOjWHhrtKVpzzSrr/U=
+github.com/sourcegraph/jsonrpc2 v0.2.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/tliron/commonlog v0.2.8 h1:vpKrEsZX4nlneC9673pXpeKqv3cFLxwpzNEZF1qiaQQ=
+github.com/tliron/commonlog v0.2.8/go.mod h1:HgQZrJEuiKLLRvUixtPWGcmTmWWtKkCtywF6x9X5Spw=
+github.com/tliron/glsp v0.2.2 h1:IKPfwpE8Lu8yB6Dayta+IyRMAbTVunudeauEgjXBt+c=
+github.com/tliron/glsp v0.2.2/go.mod h1:GMVWDNeODxHzmDPvYbYTCs7yHVaEATfYtXiYJ9w1nBg=
+github.com/tliron/kutil v0.3.11 h1:kongR0dhrrn9FR/3QRFoUfQe27t78/xQvrU9aXIy5bk=
+github.com/tliron/kutil v0.3.11/go.mod h1:4IqOAAdpJuDxYbJxMv4nL8LSH0mPofSrdwIv8u99PDc=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
+golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

grammar/Core_Lang.g4

@@ -10,7 +10,9 @@ builder_Noise: '.Noise' (noiseDefinition | ('(' resourceReference ')'));
 builder_Smear: 'Smear' '(' number ')';
 builder_Type1: '.Type1' '(' ')';
 builder_Type2: '.Type2' '(' ')';
-builder_Shift: '.Shift' '(' Axis ',' densityFn ')';
+builder_ShiftX: '.ShiftX' '(' densityFn ')';
+builder_ShiftY: '.ShiftY' '(' densityFn ')';
+builder_ShiftZ: '.ShiftZ' '(' densityFn ')';
 builder_Amplitudes: '.Amplitudes' '(' (number ',')* number  ')';
 builder_Offset: '.Offset(' Int ')';
 builder_Add:'.Add()';
@@ -26,10 +28,8 @@ builder_InRange: '.InRange' '(' densityFn ')';
 builder_OutRange: '.OutRange' '(' densityFn ')';
 
 
-
 resourceReference: (Identifier ':')? Identifier;
 
-Axis: 'x' | 'y' | 'z';
 
 Int: '-'? [0-9]+;
 Float: ('-'? [0-9]* '.' [0-9]+);
@@ -38,7 +38,7 @@ number: Int | Float;
 
 NL: [\n];
 WS: [ \t]+ -> skip;
-Identifier: [a-zA-Z][a-zA-Z0-9_]*;
+Identifier: [a-zA-Z] [a-zA-Z0-9_]*;
 
 BlockComment: '/*' .*? '*/' -> channel(HIDDEN);
 LineComment: '//' ~[\r\n]* -> channel(HIDDEN);

grammar/DensityFunctions.g4

@@ -73,7 +73,7 @@ densityFn_WierdScaledSampler: 'WeirdScaledSampler' NL* '(' NL* densityFn NL* ')'
 densityFn_WierdScaledSamplerBuilder: builder_Type1 | builder_Type2 | builder_Noise;
 
 densityFn_ShiftedNoise: 'ShiftedNoise' NL* '(' NL* ')' NL* (densityFn_ShiftedNoiseBuilder NL*)*;
-densityFn_ShiftedNoiseBuilder: builder_Noise | builder_XZScale | builder_YScale | builder_Shift;
+densityFn_ShiftedNoiseBuilder: builder_Noise | builder_XZScale | builder_YScale | builder_ShiftX | builder_ShiftY | builder_ShiftZ;
 
 densityFn_RangeChoice: 'RangeChoice' NL* '(' densityFn ')' NL* (densityFn_RangeChoiceBuilder NL*)*;
 densityFn_RangeChoiceBuilder: builder_Min | builder_Max | builder_InRange | builder_OutRange;

grammar/MinecraftMetascript.g4

@@ -4,7 +4,7 @@ import Surface,DensityFunctions, Noise, Core_Lang;
 
 script: NL* (namespace NL*)*;
 
-namespaceDeclaration: 'namespace' Identifier;
+namespaceDeclaration: 'Namespace' Identifier;
 namespace: namespaceDeclaration NL* '{' NL* (contentBlocks NL*)* NL* '}';
 
 contentBlocks: surfaceBlock | noiseBlock | densityFnBlock;

lang/File.go

@@ -1,6 +1,7 @@
 package lang
 
 import (
+	"github.com/minecraftmetascript/mms/lang/grammar"
 	"github.com/minecraftmetascript/mms/lang/traversal"
 )
 
@@ -9,6 +10,7 @@ type File struct {
 	Path        string
 	Project     *Project
 	Diagnostics []traversal.Diagnostic
+	Script      *grammar.ScriptContext
 }
 
 func (f *File) Parse() error {
@@ -18,10 +20,11 @@ func (f *File) Parse() error {
 		return err
 	}
 	parser := traversal.NewParser(f.Content, f.Path, f.Project.GlobalScope, &f.Diagnostics)
-	err = parser.Parse()
+	script, err := parser.Parse()
 	if err != nil {
 		return err
 	}
+	f.Script = script
 
 	return nil
 }

lang/constructs/worldgen/density_functions/FunctionRef.go

@@ -2,7 +2,6 @@ package density_functions
 
 import (
 	"errors"
-	"fmt"
 	"reflect"
 
 	"github.com/antlr4-go/antlr/v4"
@@ -57,9 +56,7 @@ func (c *ReferenceFunction) MarshalJSON() ([]byte, error) {
 		return nil, err
 	}
 	if c.Value == nil {
-		return nil, errors.New(
-			fmt.Sprintf("unable to resolve reference %s", c.Ref.String()),
-		)
+		return c.Ref.MarshalJSON()
 	}
 	return (*c.Value).MarshalJSON()
 }

lang/constructs/worldgen/density_functions/RangeChoiceFn.go

@@ -53,8 +53,9 @@ func init() {
 			input := densityFn.DensityFn()
 			if input == nil {
 				scope.DiagnoseSemanticError("Missing input to range choice", ctx)
+			} else {
+				out.Input = traversal.ConstructRegistry.Construct(input.(antlr.ParserRuleContext), currentNamespace, scope)
 			}
-			out.Input = traversal.ConstructRegistry.Construct(input.(antlr.ParserRuleContext), currentNamespace, scope)
 
 			for _, builderWrap := range densityFn.AllDensityFn_RangeChoiceBuilder() {
 				builder_chain.Invoke(rangeChoiceBuilder, builderWrap.GetChild(0).(antlr.ParserRuleContext), out, scope, currentNamespace)

lang/constructs/worldgen/density_functions/ShiftedNoiseFn.go

@@ -25,12 +25,7 @@ func init() {
 						builder_chain.Builder_GetFloat(ctx, func(v float64) { target.YScale = v }, scope, "YScale")
 					},
 				), builder_chain.Build(
-					func(ctx *grammar.Builder_ShiftContext, target *ShiftedNoiseDensityFn, scope *traversal.Scope, namespace string) {
-						axis := ctx.Axis()
-						if axis == nil {
-							scope.DiagnoseSemanticError("Missing or invalid Axis", ctx)
-							return
-						}
+					func(ctx *grammar.Builder_ShiftXContext, target *ShiftedNoiseDensityFn, scope *traversal.Scope, namespace string) {
 						childFnCtx := ctx.DensityFn()
 						if childFnCtx == nil {
 							scope.DiagnoseSemanticError("Missing or invalid Density Function", ctx)
@@ -40,22 +35,33 @@ func init() {
 						if fn == nil {
 							scope.DiagnoseSemanticError("Missing or invalid Density Function", ctx)
 						}
+						target.ShiftX = fn
+					}),
+				builder_chain.Build(
+					func(ctx *grammar.Builder_ShiftYContext, target *ShiftedNoiseDensityFn, scope *traversal.Scope, namespace string) {
+						childFnCtx := ctx.DensityFn()
+						if childFnCtx == nil {
+							scope.DiagnoseSemanticError("Missing or invalid Density Function", ctx)
+						}
 
-						switch axis.GetText() {
-						case "x":
-							target.ShiftX = fn
-							break
-						case "y":
-							target.ShiftY = fn
-							break
-						case "z":
-							target.ShiftZ = fn
-							break
-						default:
-							scope.DiagnoseSemanticError("Invalid Axis", ctx)
-							break
+						fn := traversal.ConstructRegistry.Construct(childFnCtx, namespace, scope)
+						if fn == nil {
+							scope.DiagnoseSemanticError("Missing or invalid Density Function", ctx)
+						}
+						target.ShiftY = fn
+					}),
+				builder_chain.Build(
+					func(ctx *grammar.Builder_ShiftZContext, target *ShiftedNoiseDensityFn, scope *traversal.Scope, namespace string) {
+						childFnCtx := ctx.DensityFn()
+						if childFnCtx == nil {
+							scope.DiagnoseSemanticError("Missing or invalid Density Function", ctx)
 						}
 
+						fn := traversal.ConstructRegistry.Construct(childFnCtx, namespace, scope)
+						if fn == nil {
+							scope.DiagnoseSemanticError("Missing or invalid Density Function", ctx)
+						}
+						target.ShiftZ = fn
 					}),
 			)
 			densityFn := ctx.(*grammar.DensityFn_ShiftedNoiseContext)