Add support for external function declaration

jeremyfa · jeremyfa · commit 197e735ceeb1 · 2025-04-06T14:05:28.000+02:00
diff --git a/src/loreline/AstPrinter.hx b/src/loreline/AstPrinter.hx
@@ -292,6 +292,9 @@ class AstPrinter {
                     add(func.name);
                     add('"');
                 }
+                if (func.external) {
+                    add(' external=true');
+                }
                 add(" args=[" + func.args.join(', ') + "]");
                 addLineBreak();
                 indentLevel++;
diff --git a/src/loreline/Interpreter.hx b/src/loreline/Interpreter.hx
@@ -1736,10 +1736,10 @@ typedef InterpreterOptions = {
     function initializeTopLevelFunction(func:NFunctionDecl) {
 
         #if hscript
-        if (func.name != null) {
+        if (func.name != null && (!func.external || !topLevelFunctions.exists(func.name))) {
             final codeToHscript = new CodeToHscript();
             try {
-                final expr = codeToHscript.process(func.code);
+                final expr = codeToHscript.process(func.code + (func.external ? " {}" : ""));
                 #if loreline_debug_functions
                 final offsets = @:privateAccess codeToHscript.posOffsets;
                 trace('\n'+func.code);
@@ -3043,7 +3043,7 @@ typedef InterpreterOptions = {
 
         // If we get here, the call target was invalid
         throw new RuntimeError(
-            'Invalid call target: ${Type.getClassName(Type.getClass(call.target))}',
+            'Invalid call target: ${printLoreline(call.target) ?? Type.getClassName(Type.getClass(call.target))}',
             call.pos
         );
 
@@ -3534,6 +3534,19 @@ typedef InterpreterOptions = {
 
     }
 
+    function printLoreline(node:Node):String {
+
+        try {
+            final printer = new Printer();
+            printer.enableComments = false;
+            return printer.print(node).trim();
+        }
+        catch (e:Any) {
+            return null;
+        }
+
+    }
+
     #if loreline_debug_interpreter
     public static dynamic function debug(message:String, ?pos:haxe.PosInfos) {
         trace(message);
diff --git a/src/loreline/Lexer.hx b/src/loreline/Lexer.hx
@@ -113,7 +113,7 @@ enum TokenType {
     KwNew;
 
     /** Function code */
-    Function(name:Null<String>, args:Array<String>, code:String);
+    Function(name:Null<String>, args:Array<String>, code:String, external:Bool);
 
     /** String literal with optional attachments */
     LString(quotes:Quotes, s:String, ?attachments:Array<LStringAttachment>);
@@ -806,7 +806,7 @@ class Token {
             if (c == " ".code) {
                 spaces++;
             } else if (c == "\t".code) {
-                spaces += 4; // Treat each tab as 4 spaces
+                spaces++;
             } else {
                 break;
             }
@@ -3103,6 +3103,9 @@ class Token {
     function readFunction(start:Position):Token {
         skipWhitespaceAndComments();
 
+        // Evaluate min indentation
+        final minIndent = start.column; // Column is 1-based, so column 0 will mean min indent 1
+
         // Read function name if present
         var name:Null<String> = null;
         if (isIdentifierStart(input.uCharCodeAt(pos))) {
@@ -3250,14 +3253,20 @@ class Token {
                     while (pos < length) {
                         final c = input.uCharCodeAt(pos);
                         if (c == " ".code) indent++;
-                        else if (c == "\t".code) indent += 4; // Count tab as 4 spaces
+                        else if (c == "\t".code) indent++;
                         else break;
                         advance();
                     }
 
                     // If this is the first line, record the indent level
                     if (functionIndentLevel == -1 && pos < length && input.uCharCodeAt(pos) != "\n".code && input.uCharCodeAt(pos) != "\r".code) {
                         functionIndentLevel = indent;
+
+                        // Check this is indented enough
+                        if (functionIndentLevel < minIndent) {
+                            pos = indentStart;
+                            break;
+                        }
                     }
                     // Check if we are done (dedent or empty line at lower indentation)
                     else if (functionIndentLevel != -1 && indent < functionIndentLevel &&
@@ -3297,10 +3306,15 @@ class Token {
 
         // Extract the function code from the original input
         final bodyEnd = pos;
-        final code = input.uSubstr(start.offset, bodyEnd - start.offset).rtrim() + "\n";
+        var code = input.uSubstr(start.offset, bodyEnd - start.offset).rtrim();
+
+        final external = (code.uIndexOf("\n") == -1);
+        if (!external) {
+            code = code + "\n";
+        }
 
         // Create token with the function code
-        final token = makeToken(Function(name, args, code), start);
+        final token = makeToken(Function(name, args, code, external), start);
         token.pos.length = code.uLength();
         return token;
     }
diff --git a/src/loreline/Node.hx b/src/loreline/Node.hx
@@ -1605,21 +1605,28 @@ class NFunctionDecl extends NExpr {
      */
     public var code:String;
 
+    /**
+     * Whether this is an external function (so this is only a declaration without implementation)
+     */
+    public var external:Bool;
+
 
     /**
      * Creates a new function node.
      * @param pos Position in source where this function appears
      * @param name The function name (if any)
      * @param args Argument names
      * @param code The actual code of the function (including the signature)
+     * @param external Whether this is an external function (so this is only a declaration without implementation)
      * @param leadingComments Optional comments before the function
      * @param trailingComments Optional comments after the function
      */
-     public function new(id:NodeId, pos:Position, name:Null<String>, args:Array<String>, code:String, ?leadingComments:Array<Comment>, ?trailingComments:Array<Comment>) {
+     public function new(id:NodeId, pos:Position, name:Null<String>, args:Array<String>, code:String, external:Bool, ?leadingComments:Array<Comment>, ?trailingComments:Array<Comment>) {
         super(id, pos, leadingComments, trailingComments);
         this.name = name;
         this.args = args;
         this.code = code;
+        this.external = external;
     }
 
     override function type():String {
@@ -1637,6 +1644,7 @@ class NFunctionDecl extends NExpr {
         }
         json.args = [].concat(args);
         json.code = code;
+        json.external = external;
         return json;
     }
 }
diff --git a/src/loreline/Parser.hx b/src/loreline/Parser.hx
@@ -396,7 +396,7 @@ class ParserContext {
             case LString(_, _, _): ensureInBeat(parseTextStatement());
             case Identifier(_) if (peek().type == Colon): ensureInBeat(parseDialogueStatement());
             case Identifier(_) | LNumber(_) | LBoolean(_) |
-                 LNull | LParen | LBracket | LBrace | OpMinus | OpNot: parseExpressionStatement();
+                 LNull | LParen | LBracket | LBrace | OpMinus | OpNot: ensureInBeat(parseExpressionStatement());
             case KwChoice: ensureInBeat(parseChoiceStatement());
             case KwIf: ensureInBeat(parseIfStatement());
             case Arrow: ensureInBeat(parseTransition());
@@ -1039,9 +1039,9 @@ class ParserContext {
         final startPos = currentPos();
 
         return switch (tokens[current].type) {
-            case Function(name, args, body):
+            case Function(name, args, code, external):
                 advance();
-                attachComments(new NFunctionDecl(nextNodeId(BLOCK), startPos, name, [].concat(args), body));
+                attachComments(new NFunctionDecl(nextNodeId(BLOCK), startPos, name, [].concat(args), code, external));
 
             case _:
                 throw new ParseError("Unexpected token in expression", currentPos());
diff --git a/src/loreline/lsp/Server.hx b/src/loreline/lsp/Server.hx
@@ -415,9 +415,11 @@ class Server {
 
                     // Check for errors in functions
                     for (func in lens.getNodesOfType(NFunctionDecl, false)) {
-                        final funcHscript = lens.getFuncHscript(func);
-                        if (funcHscript.error != null) {
-                            addDiagnostic(uri, funcHscript.error.pos, funcHscript.error.message, DiagnosticSeverity.Error);
+                        if (!func.external) {
+                            final funcHscript = lens.getFuncHscript(func);
+                            if (funcHscript.error != null) {
+                                addDiagnostic(uri, funcHscript.error.pos, funcHscript.error.message, DiagnosticSeverity.Error);
+                            }
                         }
                     }
 
@@ -455,6 +457,8 @@ class Server {
                         }
                     }
 
+                    // TODO check references to beat calls and function calls
+
                     // Add semantic validation
                     validateDocument(uri, ast);
                 }
diff --git a/test/Functions-External.lor b/test/Functions-External.lor
@@ -0,0 +1,20 @@
+
+function playExplosion()
+
+sarah: What's this green diamond? Wait, let me touch it...
+james: Nooo don't touch it!
+
+playExplosion()
+
+james: Sarah? Sarah!!
+
+/*
+<test>
+- expected: |
+    sarah: What's this green diamond? Wait, let me touch it...
+
+    james: Nooo don't touch it!
+
+    james: Sarah? Sarah!!
+</test>
+*/

Original file line number	Diff line number	Diff line change
`@@ -415,9 +415,11 @@ class Server {`
`415`	`415`
`416`	`416`	`// Check for errors in functions`
`417`	`417`	`for (func in lens.getNodesOfType(NFunctionDecl, false)) {`
`418`		`- final funcHscript = lens.getFuncHscript(func);`
`419`		`- if (funcHscript.error != null) {`
`420`		`- addDiagnostic(uri, funcHscript.error.pos, funcHscript.error.message, DiagnosticSeverity.Error);`
	`418`	`+ if (!func.external) {`
	`419`	`+ final funcHscript = lens.getFuncHscript(func);`
	`420`	`+ if (funcHscript.error != null) {`
	`421`	`+ addDiagnostic(uri, funcHscript.error.pos, funcHscript.error.message, DiagnosticSeverity.Error);`
	`422`	`+ }`
`421`	`423`	`}`
`422`	`424`	`}`
`423`	`425`
`@@ -455,6 +457,8 @@ class Server {`
`455`	`457`	`}`
`456`	`458`	`}`
`457`	`459`
	`460`	`+ // TODO check references to beat calls and function calls`
	`461`	`+`
`458`	`462`	`// Add semantic validation`
`459`	`463`	`validateDocument(uri, ast);`
`460`	`464`	`}`