cleanup

Author: ItsMeBrianD

.idea/dictionaries/project.xml

@@ -5,7 +5,7 @@ import Core_Lang, BlockState, NoiseRouter, Surface;
 noiseSettingsBlock: 'NoiseSettings' NL* '{' NL* (noiseSettingsDeclaration NL*)* NL* '}';
 
 noiseSettingsDeclaration: declare noiseSettings;
-noiseSettings: 'NoiseSettings' NL* '(' NL* ')' NL* (noiseSettings_Builder NL*)*;
+noiseSettings: 'NoiseSettings' NL* '(' NL* NL* ')' NL* (noiseSettings_Builder NL*)*;
 
 
 noiseSettings_Builder:
@@ -23,17 +23,17 @@ noiseSettings_Builder:
     | builder_NoiseRouter
     | builder_SurfaceRule
     ;
-builder_NoiseSize: '.NoiseSize' '(' Int ',' Int ')';
-builder_NoiseRouter: '.NoiseRouter' '(' noiseRouter ')';
-builder_SeaLevel: '.SeaLevel' '(' Int ')';
-builder_DisableCreatures: '.DisableCreatures' '(' ')';
-builder_DisableVeins: '.DisableVeins' '(' ')';
-builder_DisableAquifers: '.DisableAquifers' '(' ')';
-builder_LegacyRandomSource: '.LegacyRandomSource' '(' ')';
-builder_DefaultBlock: '.DefaultBlock' '(' (blockState | resourceReference) ')';
-builder_DefaultFluid: '.DefaultFluid' '(' (blockState | resourceReference) ')';
-builder_SpawnTarget: '.SpawnTarget' '(' /* TODO: Implement */ ')';
-builder_MinY: '.MinY' '(' Int ')';
-builder_Height: '.Height' '(' Int ')';
+builder_NoiseSize: '.NoiseSize' '(' NL* Int NL* ',' NL* Int NL* ')';
+builder_NoiseRouter: '.NoiseRouter' '(' NL* noiseRouter NL* ')';
+builder_SeaLevel: '.SeaLevel' '(' NL* Int NL* ')';
+builder_DisableCreatures: '.DisableCreatures' '(' NL* NL* ')';
+builder_DisableVeins: '.DisableVeins' '(' NL* NL* ')';
+builder_DisableAquifers: '.DisableAquifers' '(' NL* NL* ')';
+builder_LegacyRandomSource: '.LegacyRandomSource' '(' NL* NL* ')';
+builder_DefaultBlock: '.DefaultBlock' '(' NL* (blockState | resourceReference) NL* ')';
+builder_DefaultFluid: '.DefaultFluid' '(' NL* (blockState | resourceReference) NL* ')';
+builder_SpawnTarget: '.SpawnTarget' '(' NL* /* TODO: Implement */ NL* ')';
+builder_MinY: '.MinY' '(' NL* Int NL* ')';
+builder_Height: '.Height' '(' NL* Int NL* ')';
 
-builder_SurfaceRule: '.SurfaceRule' '(' surfaceRule ')';
+builder_SurfaceRule: '.SurfaceRule' '(' NL* surfaceRule NL* ')';

grammar/NoiseSettings.g4

@@ -2,7 +2,6 @@ package density_functions
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/antlr4-go/antlr/v4"
 	"github.com/minecraftmetascript/mms/lang/grammar"
@@ -38,33 +37,14 @@ func (m MathDensityFn) ExportSymbol(symbol traversal.Symbol, rootDir *lib.FileTr
 	return exportDensityFunction(symbol, rootDir, m)
 }
 
-func ExtractInlinedNoise(noiseCtx *grammar.NoiseDefinitionContext, currentNamespace string, scope *traversal.Scope) *traversal.Reference {
-	noiseDef := traversal.ConstructRegistry.Construct(noiseCtx, currentNamespace, scope)
-	noiseRef := traversal.NewReference(
-		fmt.Sprintf("densityfn_noise_%d_%d", noiseCtx.GetStart().GetLine(), noiseCtx.GetStart().GetColumn()),
-		"mms_inline",
-	)
-	noiseSymbol := traversal.NewSymbol(
-		traversal.RuleLocation(noiseCtx, scope.CurrentFile),
-		traversal.RuleLocation(noiseCtx, scope.CurrentFile),
-		noiseDef,
-		noiseRef,
-		"Noise",
-	)
-	if _, ok := scope.Get(*noiseRef); !ok {
-		if err := scope.Register(noiseSymbol); err != nil {
-			// TODO: Improve behavior
-			panic(err)
-		}
-	}
-	return noiseRef
-}
-
 func init() {
 	traversal.Register(
-		func(inlineCtx *grammar.DensityFn_InlineNoiseContext, currentNamespace string, scope *traversal.Scope) traversal.Construct {
-			if noiseInlineCtx := inlineCtx.Noise(); noiseInlineCtx != nil {
-				return ExtractInlinedNoise(noiseInlineCtx.NoiseDefinition().(*grammar.NoiseDefinitionContext), currentNamespace, scope)
+		func(ctx *grammar.DensityFn_InlineNoiseContext, namespace string, scope *traversal.Scope) traversal.Construct {
+			if noiseCtx := ctx.Noise(); noiseCtx != nil {
+				if _, ref := traversal.ExtractInlineConstruct(noiseCtx.NoiseDefinition(), namespace, scope, "Noise"); ref != nil {
+					return ref
+				}
+
 			}
 			return nil
 		},
@@ -140,6 +120,7 @@ func exportDensityFunction(symbol traversal.Symbol, rootDir *lib.FileTreeLike, c
 		return err
 	}
 	rootDir.
+		MkDir("data", nil).
 		MkDir(symbol.GetReference().GetNamespace(), nil).
 		MkDir("worldgen", nil).
 		MkDir("density_function", nil).

lang/constructs/worldgen/density_functions/DensityFn.go

@@ -50,11 +50,11 @@ func init() {
 							continue
 						}
 					} else if inline := noise.NoiseDefinition(); inline != nil {
-						ref := ExtractInlinedNoise(inline.(*grammar.NoiseDefinitionContext), currentNamespace, scope)
+						_, ref := traversal.ExtractInlineConstruct(inline, currentNamespace, scope, "Noise")
+
 						if ref != nil {
 							out.Noise = *ref
 						} else {
-							// TODO: Diagnose
 							scope.DiagnoseSemanticError("Invalid inline noise definition.", noise)
 							continue
 						}

lang/constructs/worldgen/density_functions/WeirdScaledSamplerFn.go

@@ -74,6 +74,21 @@ func getBuilder() *builder_chain.BuilderChain[NoiseSettings] {
 				builder_chain.Builder_GetInt(ctx, func(v int) { target.Height = v }, scope, "MinY")
 			},
 		),
+		builder_chain.Build(
+			func(ctx *grammar.Builder_NoiseRouterContext, target *NoiseSettings, scope *traversal.Scope, namespace string) {
+				if sym, _ := traversal.ExtractInlineConstruct(ctx.NoiseRouter(), namespace, scope, "NoiseRouter"); sym != nil {
+					target.NoiseRouter = sym.GetValue()
+				}
+			},
+		),
+		builder_chain.Build(
+			func(ctx *grammar.Builder_SurfaceRuleContext, target *NoiseSettings, scope *traversal.Scope, namespace string) {
+				if sym, _ :=
+					traversal.ExtractInlineConstruct(ctx.SurfaceRule(), namespace, scope, "SurfaceRule"); sym != nil {
+					target.NoiseRouter = sym.GetValue()
+				}
+			},
+		),
 		builder_chain.Build(
 			func(ctx *grammar.Builder_NoiseSizeContext, target *NoiseSettings, scope *traversal.Scope, namespace string) {
 				horizontalCtx := ctx.Int(0)
@@ -169,8 +184,8 @@ func init() {
 				chain,
 				settings,
 				scope,
-				reflect.TypeFor[*grammar.Builder_NoiseRouterContext](),
-				".NoiseRouter",
+				reflect.TypeFor[*grammar.Builder_SurfaceRuleContext](),
+				".SurfaceRule",
 			)
 			return out
 		},