loreline 0.9.1 → 0.10.0

package/js/loreline.js

@@ -1,4 +1,4 @@
-let runtime = {}; let globals = {}; // Generated by Haxe 4.3.6
+let runtime = {}; let globals = {}; // Generated by Haxe 4.3.7
 (function ($hx_exports, $global) { "use strict";
 $hx_exports["loreline"] = $hx_exports["loreline"] || {};
 var $hxClasses = {},$estr = function() { return js_Boot.__string_rec(this,''); },$hxEnums = $hxEnums || {},$_;
@@ -4211,11 +4211,13 @@ class loreline_CodeToLorscript {
 		this.length = 0;
 		this.lineOutput = null;
 		this.output = null;
+		this.inputText = null;
 		this.input = null;
 		this.index = 0;
 	}
 	process(input) {
 		input = StringTools.rtrim(input) + "\n//<END>";
+		this.inputText = input;
 		this.input = input;
 		this.index = 0;
 		this.output = new StringBuf();
@@ -4238,7 +4240,7 @@ class loreline_CodeToLorscript {
 		let min = this.inputPosFromProcessedPos(pmin);
 		let max = this.inputPosFromProcessedPos(pmax);
 		let len = max + 1 - min;
-		return funcPos.withOffset(this.input,min,len,funcPos.offset);
+		return funcPos.withOffset(this.inputText,min,len,funcPos.offset);
 	}
 	inputPosFromProcessedPos(pos) {
 		if(pos < 0) {
@@ -5058,7 +5060,7 @@ class loreline_CodeToLorscript {
 			if(this.inStatementsBlock() || this.inObjectBlock() || this.inArrayBlock()) {
 				let indent = this.nextLineIndentOffset(line,this.index);
 				if(StringTools.trim(line).length != 0) {
-					if(indent > 0 && !this.endsOrFollowsWithChar(line,123,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1061, className : "loreline.CodeToLorscript", methodName : "_add"}) && !this.endsOrFollowsWithChar(line,91,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1061, className : "loreline.CodeToLorscript", methodName : "_add"})) {
+					if(indent > 0 && !this.endsOrFollowsWithChar(line,123,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1070, className : "loreline.CodeToLorscript", methodName : "_add"}) && !this.endsOrFollowsWithChar(line,91,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1070, className : "loreline.CodeToLorscript", methodName : "_add"})) {
 						let trimmedLine = StringTools.ltrim(line);
 						let isCaseLabel = trimmedLine.startsWith("case ") || trimmedLine.startsWith("case\t") || (trimmedLine == "default" || trimmedLine.startsWith("default ") || trimmedLine.startsWith("default\t"));
 						if(isCaseLabel) {
@@ -5080,7 +5082,7 @@ class loreline_CodeToLorscript {
 							this.posOffsets.push(this.currentPosOffset);
 						}
 					} else if(indent < 0 && this.stack.length > 0 && (this.stack[this.stack.length - 1] == 3 || this.stack[this.stack.length - 1] == 4)) {
-						if(!this.inObjectBlock() && !this.endsOrFollowsWithChar(line,59,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1090, className : "loreline.CodeToLorscript", methodName : "_add"})) {
+						if(!this.inObjectBlock() && !this.endsOrFollowsWithChar(line,59,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1099, className : "loreline.CodeToLorscript", methodName : "_add"})) {
 							this.currentPosOffset++;
 							this.output.b += String.fromCodePoint(59);
 							this.posOffsets.push(this.currentPosOffset);
@@ -5102,7 +5104,7 @@ class loreline_CodeToLorscript {
 								this.posOffsets.push(this.currentPosOffset);
 							}
 						}
-					} else if(indent == 0 && !this.endsOrFollowsWithChar(line,59,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1115, className : "loreline.CodeToLorscript", methodName : "_add"}) && !this.endsOrFollowsWithChar(line,44,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1115, className : "loreline.CodeToLorscript", methodName : "_add"})) {
+					} else if(indent == 0 && !this.endsOrFollowsWithChar(line,59,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1124, className : "loreline.CodeToLorscript", methodName : "_add"}) && !this.endsOrFollowsWithChar(line,44,this.index,{ fileName : "src/loreline/CodeToLorscript.hx", lineNumber : 1124, className : "loreline.CodeToLorscript", methodName : "_add"})) {
 						if(this.inObjectBlock()) {
 							this.currentPosOffset++;
 							this.output.b += String.fromCodePoint(44);
@@ -5172,7 +5174,7 @@ class loreline_CodeToLorscript {
 		}
 	}
 	error(message) {
-		throw haxe_Exception.thrown(new loreline_Error(message,loreline_Position.fromContentAndIndex(this.input,this.index)));
+		throw haxe_Exception.thrown(new loreline_Error(message,loreline_Position.fromContentAndIndex(this.inputText,this.index)));
 	}
 }
 $hxClasses["loreline.CodeToLorscript"] = loreline_CodeToLorscript;
@@ -5185,6 +5187,9 @@ class loreline_Equal {
 		if(a == b) {
 			return true;
 		}
+		if(a == null || b == null) {
+			return false;
+		}
 		if(loreline_Arrays.isArray(a)) {
 			if(loreline_Arrays.isArray(b)) {
 				return loreline_Equal.arrayEqual(interpreter,a,b);
@@ -5750,7 +5755,7 @@ class loreline_Functions {
 		return null;
 	}
 	has_beat(name) {
-		if(((name) instanceof loreline_NBeatDecl)) {
+		if(loreline_RuntimeBeatRef.beatOf(name) != null) {
 			return true;
 		}
 		let nameStr = name;
@@ -5786,8 +5791,8 @@ class loreline_Functions {
 				--i;
 			}
 			return 0;
-		} else if(((name) instanceof loreline_NBeatDecl)) {
-			return this.interpreter.getBeatVisitCount(name);
+		} else if(loreline_RuntimeBeatRef.beatOf(name) != null) {
+			return this.interpreter.getBeatVisitCount(loreline_RuntimeBeatRef.beatOf(name));
 		} else {
 			let beat = this.interpreter.resolveBeatByName(name);
 			if(beat == null) {
@@ -6871,11 +6876,12 @@ var loreline_RuntimeAccess = $hxEnums["loreline.RuntimeAccess"] = { __ename__:"l
 	,ArrayAccess: ($_=function(pos,array,index) { return {_hx_index:1,pos:pos,array:array,index:index,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="ArrayAccess",$_.__params__ = ["pos","array","index"],$_)
 	,CharacterAccess: ($_=function(pos,name) { return {_hx_index:2,pos:pos,name:name,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="CharacterAccess",$_.__params__ = ["pos","name"],$_)
 	,FunctionAccess: ($_=function(pos,name) { return {_hx_index:3,pos:pos,name:name,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="FunctionAccess",$_.__params__ = ["pos","name"],$_)
-	,BeatAccess: ($_=function(pos,beat) { return {_hx_index:4,pos:pos,beat:beat,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="BeatAccess",$_.__params__ = ["pos","beat"],$_)
+	,BeatAccess: ($_=function(pos,ref) { return {_hx_index:4,pos:pos,ref:ref,__enum__:"loreline.RuntimeAccess",toString:$estr}; },$_._hx_name="BeatAccess",$_.__params__ = ["pos","ref"],$_)
 };
 loreline_RuntimeAccess.__constructs__ = [loreline_RuntimeAccess.FieldAccess,loreline_RuntimeAccess.ArrayAccess,loreline_RuntimeAccess.CharacterAccess,loreline_RuntimeAccess.FunctionAccess,loreline_RuntimeAccess.BeatAccess];
 class loreline_RuntimeScope {
-	constructor(id,beat,node,beats,state,head,insertion) {
+	constructor(id,beat,node,beats,state,head,insertion,captured) {
+		this.captured = null;
 		this.insertion = null;
 		this.head = null;
 		this.state = null;
@@ -6898,6 +6904,9 @@ class loreline_RuntimeScope {
 		if(insertion != null) {
 			this.insertion = insertion;
 		}
+		if(captured != null) {
+			this.captured = captured;
+		}
 	}
 	beatByName(name) {
 		if(this.beats == null) {
@@ -6920,6 +6929,35 @@ loreline_RuntimeScope.__name__ = "loreline.RuntimeScope";
 Object.assign(loreline_RuntimeScope.prototype, {
 	__class__: loreline_RuntimeScope
 });
+class loreline_RuntimeBeatRef {
+	constructor(beat,stack) {
+		this.beat = beat;
+		this.stack = stack;
+	}
+	static beatOf(value) {
+		if(((value) instanceof loreline_NBeatDecl)) {
+			return value;
+		}
+		if(((value) instanceof loreline_RuntimeBeatRef)) {
+			let ref = value;
+			return ref.beat;
+		}
+		return null;
+	}
+	static beatNameOf(value) {
+		let beat = loreline_RuntimeBeatRef.beatOf(value);
+		if(beat != null) {
+			return beat.name;
+		} else {
+			return null;
+		}
+	}
+}
+$hxClasses["loreline.RuntimeBeatRef"] = $hx_exports["loreline"]["RuntimeBeatRef"] = loreline_RuntimeBeatRef;
+loreline_RuntimeBeatRef.__name__ = "loreline.RuntimeBeatRef";
+Object.assign(loreline_RuntimeBeatRef.prototype, {
+	__class__: loreline_RuntimeBeatRef
+});
 class loreline_RuntimeInsertion {
 	constructor(id,origin) {
 		this.parentNextOptionIndex = 0;
@@ -6985,6 +7023,10 @@ Object.assign(loreline_EvalNext.prototype, {
 });
 class loreline_Interpreter {
 	constructor(script,handleDialogue,handleChoice,handleFinish,options) {
+		this._restoreInsertionsCache = null;
+		this._restoreSavedInsertions = null;
+		this._serializingScopes = [];
+		this._saveInsertions = null;
 		this._choiceEvalEnabled = [];
 		this._choiceEvalTexts = [];
 		this.pendingChoiceOptions = null;
@@ -7044,7 +7086,10 @@ class loreline_Interpreter {
 		}
 	}
 	get_currentInsertion() {
-		let i = this.stack.length - 1;
+		return this.insertionAtOrBelow(this.stack.length - 1);
+	}
+	insertionAtOrBelow(scopeLevel) {
+		let i = scopeLevel;
 		while(i >= 0) {
 			let scope = this.stack[i];
 			if(scope.insertion != null) {
@@ -7138,6 +7183,7 @@ class loreline_Interpreter {
 	}
 	save() {
 		let insertions = { };
+		this._saveInsertions = insertions;
 		let _g = [];
 		let _g1 = 0;
 		let _g2 = this.stack;
@@ -7175,6 +7221,7 @@ class loreline_Interpreter {
 		if(Reflect.fields(insertions).length > 0) {
 			result.insertions = insertions;
 		}
+		this._saveInsertions = null;
 		return result;
 	}
 	restore(saveData) {
@@ -7188,10 +7235,12 @@ class loreline_Interpreter {
 		this.pendingChoiceOptions = null;
 		this._choiceEvalTexts.length = 0;
 		this._choiceEvalEnabled.length = 0;
+		let restoredInsertions = new haxe_ds_IntMap();
+		this._restoreSavedInsertions = saveData.insertions;
+		this._restoreInsertionsCache = restoredInsertions;
 		this.restoreState(this.topLevelState,saveData.state);
 		this.restoreCharacters(saveData.characters);
 		this.restoreNodeStates(saveData.nodeStates);
-		let restoredInsertions = new haxe_ds_IntMap();
 		if(!this.restoreStack(saveData.stack,saveData.insertions,restoredInsertions)) {
 			this.beatToResume = this.restoreBeatToResume(saveData.stack);
 		}
@@ -7220,6 +7269,8 @@ class loreline_Interpreter {
 				this._choiceEvalEnabled.push(entry.disabled != true);
 			}
 		}
+		this._restoreSavedInsertions = null;
+		this._restoreInsertionsCache = null;
 	}
 	resume() {
 		if(this.stack.length == 0) {
@@ -7257,25 +7308,50 @@ class loreline_Interpreter {
 		let fields = this.topLevelCharacters.h[character].fields;
 		loreline_Objects.setField(this,fields,name,value);
 	}
-	getStateField(name) {
-		let i = this.stack.length - 1;
+	eachResolutionScope(startIndex,visit) {
+		this.walkResolutionScopes(this.stack,startIndex == -1 ? this.stack.length - 1 : startIndex,visit);
+	}
+	walkResolutionScopes(scopes,startIndex,visit) {
+		let i = startIndex;
 		while(i >= 0) {
-			let scope = this.stack[i];
+			let scope = scopes[i];
+			if(visit(scope)) {
+				return;
+			}
+			if(scope.captured != null) {
+				this.walkResolutionScopes(scope.captured,scope.captured.length - 1,visit);
+				return;
+			}
+			--i;
+		}
+	}
+	getStateField(name) {
+		let found = false;
+		let result = null;
+		let _gthis = this;
+		this.eachResolutionScope(-1,function(scope) {
 			if(scope.state != null) {
-				if(loreline_Objects.fieldExists(this,scope.state.fields,name)) {
-					return loreline_Objects.getField(this,scope.state.fields,name);
+				if(loreline_Objects.fieldExists(_gthis,scope.state.fields,name)) {
+					result = loreline_Objects.getField(_gthis,scope.state.fields,name);
+					found = true;
+					return true;
 				}
 			}
 			if(scope.node != null) {
 				let key = scope.node.id.thisVal;
-				let stateInNode = this.nodeStates.map._get(key.high,key.low);
+				let stateInNode = _gthis.nodeStates.map._get(key.high,key.low);
 				if(stateInNode != null) {
-					if(loreline_Objects.fieldExists(this,stateInNode.fields,name)) {
-						return loreline_Objects.getField(this,stateInNode.fields,name);
+					if(loreline_Objects.fieldExists(_gthis,stateInNode.fields,name)) {
+						result = loreline_Objects.getField(_gthis,stateInNode.fields,name);
+						found = true;
+						return true;
 					}
 				}
 			}
-			--i;
+			return false;
+		});
+		if(found) {
+			return result;
 		}
 		if(loreline_Objects.fieldExists(this,this.topLevelState.fields,name)) {
 			return loreline_Objects.getField(this,this.topLevelState.fields,name);
@@ -7283,26 +7359,31 @@ class loreline_Interpreter {
 		return null;
 	}
 	setStateField(name,value) {
-		let i = this.stack.length - 1;
-		while(i >= 0) {
-			let scope = this.stack[i];
+		let done = false;
+		let _gthis = this;
+		this.eachResolutionScope(-1,function(scope) {
 			if(scope.state != null) {
-				if(loreline_Objects.fieldExists(this,scope.state.fields,name)) {
-					loreline_Objects.setField(this,scope.state.fields,name,value);
-					return;
+				if(loreline_Objects.fieldExists(_gthis,scope.state.fields,name)) {
+					loreline_Objects.setField(_gthis,scope.state.fields,name,value);
+					done = true;
+					return true;
 				}
 			}
 			if(scope.node != null) {
 				let key = scope.node.id.thisVal;
-				let stateInNode = this.nodeStates.map._get(key.high,key.low);
+				let stateInNode = _gthis.nodeStates.map._get(key.high,key.low);
 				if(stateInNode != null) {
-					if(loreline_Objects.fieldExists(this,stateInNode.fields,name)) {
-						loreline_Objects.setField(this,stateInNode.fields,name,value);
-						return;
+					if(loreline_Objects.fieldExists(_gthis,stateInNode.fields,name)) {
+						loreline_Objects.setField(_gthis,stateInNode.fields,name,value);
+						done = true;
+						return true;
 					}
 				}
 			}
-			--i;
+			return false;
+		});
+		if(done) {
+			return;
 		}
 		loreline_Objects.setField(this,this.topLevelState.fields,name,value);
 	}
@@ -7332,6 +7413,7 @@ class loreline_Interpreter {
 	}
 	serializeScope(scope,insertions) {
 		let result = { id : scope.id};
+		this._serializingScopes.push(scope);
 		if(scope.beat != null) {
 			result.beat = this.serializeBeatReference(scope.beat);
 		}
@@ -7358,6 +7440,18 @@ class loreline_Interpreter {
 		if(scope.insertion != null) {
 			result.insertion = this.serializeInsertion(scope.insertion,insertions);
 		}
+		if(scope.captured != null) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = scope.captured;
+			while(_g1 < _g2.length) {
+				let captured = _g2[_g1];
+				++_g1;
+				_g.push(this.serializeScope(captured,insertions));
+			}
+			result.captured = _g;
+		}
+		this._serializingScopes.pop();
 		return result;
 	}
 	serializeInsertion(insertion,insertions) {
@@ -7529,6 +7623,17 @@ class loreline_Interpreter {
 					result[key] = this.serializeValue(value);
 				}
 			}
+		} else if(js_Boot.getClass(fields) == null) {
+			let _g = 0;
+			let _g1 = Reflect.fields(fields);
+			while(_g < _g1.length) {
+				let key = _g1[_g];
+				++_g;
+				let value = Reflect.field(fields,key);
+				if(originalFields == null || !loreline_Objects.fieldExists(this,originalFields,key) || !loreline_Equal.equal(this,loreline_Objects.getField(this,originalFields,key),value)) {
+					result[key] = this.serializeValue(value);
+				}
+			}
 		} else {
 			let cls = js_Boot.getClass(fields);
 			if(cls != null) {
@@ -7569,6 +7674,39 @@ class loreline_Interpreter {
 			}
 			return arr;
 		}
+		let asBeat = loreline_RuntimeBeatRef.beatOf(value);
+		if(asBeat != null) {
+			let serializedRef = { type : "$beatRef", beat : this.serializeBeatReference(asBeat)};
+			if(((value) instanceof loreline_RuntimeBeatRef)) {
+				let ref = value;
+				if(ref.stack.length > 0) {
+					let cyclic = false;
+					let _g = 0;
+					let _g1 = ref.stack;
+					while(_g < _g1.length) {
+						let captured = _g1[_g];
+						++_g;
+						if(this._serializingScopes.indexOf(captured) != -1) {
+							cyclic = true;
+							break;
+						}
+					}
+					if(!cyclic) {
+						let insertions = this._saveInsertions != null ? this._saveInsertions : { };
+						let _g = [];
+						let _g1 = 0;
+						let _g2 = ref.stack;
+						while(_g1 < _g2.length) {
+							let captured = _g2[_g1];
+							++_g1;
+							_g.push(this.serializeScope(captured,insertions));
+						}
+						serializedRef.stack = _g;
+					}
+				}
+			}
+			return serializedRef;
+		}
 		return this.serializeFields(value);
 	}
 	resumeNode(node,scopeLevel,next) {
@@ -7579,6 +7717,9 @@ class loreline_Interpreter {
 			case loreline_NAlternative:
 				this.resumeAlternative(node,scopeLevel,next);
 				break;
+			case loreline_NBeatCall:
+				this.resumeBeatCall(node,scopeLevel,next);
+				break;
 			case loreline_NBeatDecl:
 				this.resumeBeatRun(node,scopeLevel,next);
 				break;
@@ -7608,6 +7749,9 @@ class loreline_Interpreter {
 			case loreline_NAlternative:
 				this.evalAlternative(node,next);
 				break;
+			case loreline_NBeatCall:
+				this.evalBeatCall(node,next);
+				break;
 			case loreline_NCall:
 				if(!this.isBeatCall(node)) {
 					this.evalCall(node,next);
@@ -7645,7 +7789,7 @@ class loreline_Interpreter {
 				throw haxe_Exception.thrown(new loreline_RuntimeError("Failed to resolve head in scope when resuming through body",node.pos));
 			}
 		}
-		let currentInsertion = this.get_currentInsertion();
+		let currentInsertion = this.insertionAtOrBelow(scopeLevel);
 		let moveNext = null;
 		let _gthis = this;
 		moveNext = function() {
@@ -7688,13 +7832,23 @@ class loreline_Interpreter {
 			if(scopeLevel + 1 < this.stack.length) {
 				this.resumeNodeBody(option,scopeLevel + 1,option.body,next);
 			} else {
-				this.evalNodeBody(currentScope.beat,option,option.body,null,next);
+				this.evalNodeBody(currentScope.beat,option,option.body,null,null,null,next);
 			}
 		} else if(currentScope.insertion != null) {
 			let insertionNode = currentScope.node;
 			let insertion = currentScope.insertion;
 			if(((insertionNode) instanceof loreline_NBeatDecl)) {
 				let beat = insertionNode;
+				let isRootPhase1 = true;
+				let _g = 0;
+				let _g1 = scopeLevel;
+				while(_g < _g1) {
+					let i = _g++;
+					if(this.stack[i].insertion != null) {
+						isRootPhase1 = false;
+						break;
+					}
+				}
 				this.resumeNodeBody(beat,scopeLevel,beat.body,function() {
 					let options = insertion.parentPartialOptions != null ? insertion.parentPartialOptions : [];
 					if(insertion.options != null) {
@@ -7711,7 +7865,7 @@ class loreline_Interpreter {
 					let optionsDone = _gthis.wrapNext(function() {
 						_gthis.presentChoice(choice,options,next);
 					});
-					_gthis.evalChoiceOptionsAndInsertions(parentBeat,choice,options,optionsDone.cb,nextIndex,true);
+					_gthis.evalChoiceOptionsAndInsertions(parentBeat,choice,options,optionsDone.cb,nextIndex,isRootPhase1);
 					optionsDone.sync = false;
 				});
 			} else {
@@ -7759,32 +7913,20 @@ class loreline_Interpreter {
 		throw haxe_Exception.thrown(new loreline_RuntimeError("Failed to resume alternative: head not found in any item",alt.pos));
 	}
 	resumeCall(call,scopeLevel,next) {
-		if(((call.target) instanceof loreline_NAccess)) {
-			let access = call.target;
-			if(access.target == null) {
-				let beatName = access.name;
-				let resolvedBeat = null;
-				let i = this.stack.length - 1;
-				while(i >= 0) {
-					let scope = this.stack[i];
-					let beatInScope = scope.beatByName(beatName);
-					if(beatInScope != null) {
-						resolvedBeat = beatInScope;
-						break;
-					}
-					--i;
-				}
-				if(resolvedBeat == null && Object.prototype.hasOwnProperty.call(this.topLevelBeats.h,beatName)) {
-					resolvedBeat = this.topLevelBeats.h[beatName];
-				}
-				if(resolvedBeat != null) {
-					this.resumeBeatRun(resolvedBeat,scopeLevel,next);
-					return;
-				}
-			}
+		let resolvedRef = this.resolveBeatRefFromCall(call);
+		if(resolvedRef != null) {
+			this.resumeBeatRun(resolvedRef.beat,scopeLevel,next);
+			return;
 		}
 		throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot resume through a function call that is not at the bottom of the stack",call.pos));
 	}
+	resumeBeatCall(call,scopeLevel,next) {
+		if(scopeLevel >= 0 && scopeLevel < this.stack.length && ((this.stack[scopeLevel].node) instanceof loreline_NBeatDecl)) {
+			this.resumeBeatRun(this.stack[scopeLevel].node,scopeLevel,next);
+			return;
+		}
+		throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot resume through a beat call that is not at the bottom of the stack",call.pos));
+	}
 	restoreStack(savedStack,savedInsertions,restoredInsertions) {
 		let result = [];
 		if(restoredInsertions == null) {
@@ -7842,7 +7984,22 @@ class loreline_Interpreter {
 		if(savedScope.insertion != null && savedInsertions != null) {
 			insertion = this.restoreInsertion(savedScope.insertion,savedInsertions,restoredInsertions);
 		}
-		return new loreline_RuntimeScope(null,beat,node,beats,state,head,insertion);
+		let captured = null;
+		if(savedScope.captured != null) {
+			captured = [];
+			let _g = 0;
+			let _g1 = savedScope.captured;
+			while(_g < _g1.length) {
+				let savedCaptured = _g1[_g];
+				++_g;
+				let capturedScope = this.restoreScopeItem(savedCaptured,savedInsertions,restoredInsertions);
+				if(capturedScope == null) {
+					return null;
+				}
+				captured.push(capturedScope);
+			}
+		}
+		return new loreline_RuntimeScope(null,beat,node,beats,state,head,insertion,captured);
 	}
 	restoreInsertion(insertionId,savedInsertions,restoredInsertions) {
 		if(restoredInsertions.h.hasOwnProperty(insertionId)) {
@@ -8065,6 +8222,31 @@ class loreline_Interpreter {
 			}
 			return arr;
 		}
+		if(Reflect.field(value,"type") == "$beatRef") {
+			let savedRef = value;
+			let beat = this.restoreBeat(savedRef.beat);
+			if(beat == null) {
+				return null;
+			}
+			let chain = [];
+			if(savedRef.stack != null) {
+				let savedInsertions = this._restoreSavedInsertions != null ? this._restoreSavedInsertions : { };
+				let cache = this._restoreInsertionsCache != null ? this._restoreInsertionsCache : new haxe_ds_IntMap();
+				let _g = 0;
+				let _g1 = savedRef.stack;
+				while(_g < _g1.length) {
+					let savedScope = _g1[_g];
+					++_g;
+					let scope = this.restoreScopeItem(savedScope,savedInsertions,cache);
+					if(scope == null) {
+						chain = [];
+						break;
+					}
+					chain.push(scope);
+				}
+			}
+			return new loreline_RuntimeBeatRef(beat,chain);
+		}
 		return this.restoreFields(null,value);
 	}
 	initializeTopLevelFunctions(functions) {
@@ -8282,13 +8464,52 @@ class loreline_Interpreter {
 			}
 		}
 	}
+	evaluateBeatArgs(beat,args,pos) {
+		if(args == null || args.length == 0) {
+			return null;
+		}
+		let numParams = beat.params != null ? beat.params.length : 0;
+		if(args.length > numParams) {
+			throw haxe_Exception.thrown(new loreline_RuntimeError("Beat " + beat.name + " expects at most " + numParams + " argument(s), got " + args.length,pos));
+		}
+		let _g = [];
+		let _g1 = 0;
+		while(_g1 < args.length) {
+			let arg = args[_g1];
+			++_g1;
+			_g.push(this.evaluateExpression(arg));
+		}
+		return _g;
+	}
+	seedBeatParams(scope,beat,values) {
+		let params = beat.params;
+		if(params == null || params.length == 0) {
+			return;
+		}
+		if(scope.state == null) {
+			scope.state = new loreline_RuntimeState(this,beat,null,null);
+		}
+		let _g = 0;
+		let _g1 = params.length;
+		while(_g < _g1) {
+			let i = _g++;
+			let param = params[i];
+			let value = null;
+			if(values != null && i < values.length) {
+				value = values[i];
+			} else if(param.defaultValue != null) {
+				value = this.evaluateExpression(param.defaultValue);
+			}
+			loreline_Objects.setField(this,scope.state.fields,param.name,value);
+		}
+	}
 	finish() {
 		this.finishTrigger = null;
 		if(this.handleFinish != null) {
 			this.handleFinish(this);
 		}
 	}
-	transitionToBeat(beat) {
+	transitionToBeat(beat,argValues,capturedChain) {
 		while(this.pop()) {
 		}
 		this.nextScopeId = 1;
@@ -8298,7 +8519,7 @@ class loreline_Interpreter {
 		this._choiceEvalEnabled.length = 0;
 		let done = this.wrapNext($bind(this,this.finish));
 		this.finishTrigger = done;
-		this.evalBeatRun(beat,done.cb);
+		this.evalBeatRun(beat,done.cb,argValues,capturedChain);
 		done.sync = false;
 	}
 	evalNode(node,next) {
@@ -8309,6 +8530,9 @@ class loreline_Interpreter {
 		case loreline_NAssign:
 			this.evalAssignment(node,next);
 			break;
+		case loreline_NBeatCall:
+			this.evalBeatCall(node,next);
+			break;
 		case loreline_NBeatDecl:
 			this.evalBeatDecl(node,next);
 			break;
@@ -8350,8 +8574,14 @@ class loreline_Interpreter {
 		this.get_currentScope().beats.push(beat);
 		next();
 	}
-	evalNodeBody(beat,node,body,insertion,next) {
-		this.push(new loreline_RuntimeScope(null,beat,node,null,null,null,insertion));
+	evalNodeBody(beat,node,body,insertion,argValues,capturedChain,next) {
+		this.push(new loreline_RuntimeScope(null,beat,node,null,null,null,insertion,null));
+		if(node == beat && beat != null && beat.params != null) {
+			this.seedBeatParams(this.get_currentScope(),beat,argValues);
+		}
+		if(node == beat && beat != null && capturedChain != null && capturedChain.length > 0) {
+			this.get_currentScope().captured = capturedChain;
+		}
 		let index = 0;
 		let moveNext = null;
 		let currentInsertion = this.get_currentInsertion();
@@ -8374,9 +8604,9 @@ class loreline_Interpreter {
 		};
 		moveNext();
 	}
-	evalBeatRun(beat,next) {
+	evalBeatRun(beat,next,argValues,capturedChain) {
 		this.incrementBeatVisitCount(beat);
-		this.evalNodeBody(beat,beat,beat.body,null,next);
+		this.evalNodeBody(beat,beat,beat.body,null,argValues,capturedChain,next);
 	}
 	evalStateDecl(state,next) {
 		this.initializeState(state,this.get_currentScope());
@@ -8473,7 +8703,7 @@ class loreline_Interpreter {
 						_gthis.stack.push(scope);
 					}
 					let lastScope = _gthis.stack[_gthis.stack.length - 1];
-					_gthis.push(new loreline_RuntimeScope(null,lastScope.beat,_gthis.lens.getParentNode(option.node),null,null,option.node,null));
+					_gthis.push(new loreline_RuntimeScope(null,lastScope.beat,_gthis.lens.getParentNode(option.node),null,null,option.node,null,null));
 					_gthis.resumeFromLevel(scopeLevel,wrappedNext);
 				} else {
 					_gthis.evalChoiceOption(option.node,wrappedNext);
@@ -8517,10 +8747,6 @@ class loreline_Interpreter {
 					let i = _g++;
 					let opt = insertion.options[i];
 					result.push(opt);
-					if(isChoiceRoot) {
-						_gthis._choiceEvalTexts.push(opt.text);
-						_gthis._choiceEvalEnabled.push(opt.enabled);
-					}
 				}
 				insertion = null;
 			}
@@ -8534,10 +8760,8 @@ class loreline_Interpreter {
 					let str = _gthis.getTranslatedString(option,option.text);
 					let content = _gthis.evaluateString(str);
 					result.push(new loreline_ChoiceOption(content.text,content.tags,enabled,option,_gthis.get_currentInsertion()));
-					if(isChoiceRoot) {
-						_gthis._choiceEvalTexts.push(content.text);
-						_gthis._choiceEvalEnabled.push(enabled);
-					}
+					_gthis._choiceEvalTexts.push(content.text);
+					_gthis._choiceEvalEnabled.push(enabled);
 					done.cb();
 					done.sync = false;
 				} else if(option.insertion != null) {
@@ -8561,36 +8785,36 @@ class loreline_Interpreter {
 		moveNext();
 	}
 	evalInsertion(insertion,next) {
-		let beatName = insertion.origin.target;
-		let resolvedBeat = null;
-		let i = this.stack.length - 1;
-		while(i >= 0) {
-			let scope = this.stack[i];
-			let beatInScope = scope.beatByName(beatName);
-			if(beatInScope != null) {
-				resolvedBeat = beatInScope;
-				break;
-			}
-			--i;
-		}
-		if(resolvedBeat == null) {
-			if(Object.prototype.hasOwnProperty.call(this.topLevelBeats.h,beatName)) {
-				resolvedBeat = this.topLevelBeats.h[beatName];
+		let origin = insertion.origin;
+		let resolvedRef = null;
+		if(origin.targetExpr != null) {
+			let value = this.evaluateExpression(origin.targetExpr);
+			resolvedRef = this.resolveDynamicBeatTarget(value,origin);
+		} else {
+			let beatName = origin.target;
+			resolvedRef = this.resolveBeatRefFromNode(beatName,origin);
+			if(resolvedRef == null) {
+				throw haxe_Exception.thrown(this.beatNotFoundError(beatName,origin));
 			}
 		}
-		if(resolvedBeat == null) {
-			throw haxe_Exception.thrown(new loreline_RuntimeError("Beat " + beatName + " not found",this.script.pos));
-		}
-		this.evalNodeBody(resolvedBeat,resolvedBeat,resolvedBeat.body,insertion,next);
+		let resolvedBeat = resolvedRef.beat;
+		let argValues = this.evaluateBeatArgs(resolvedBeat,origin.args,origin.pos);
+		this.evalNodeBody(resolvedBeat,resolvedBeat,resolvedBeat.body,insertion,argValues,resolvedRef.stack.length > 0 ? resolvedRef.stack : null,next);
+	}
+	evalBeatCall(call,next) {
+		let value = this.evaluateExpression(call.targetExpr);
+		let resolvedRef = this.resolveDynamicBeatTarget(value,call);
+		let argValues = this.evaluateBeatArgs(resolvedRef.beat,call.args,call.pos);
+		this.evalBeatRun(resolvedRef.beat,next,argValues,resolvedRef.stack.length > 0 ? resolvedRef.stack : null);
 	}
 	evalChoiceOption(option,next) {
-		this.evalNodeBody(this.get_currentScope().beat,option,option.body,null,next);
+		this.evalNodeBody(this.get_currentScope().beat,option,option.body,null,null,null,next);
 	}
 	evalIf(ifStmt,next) {
 		let isTrue = this.evaluateCondition(ifStmt.condition);
 		let branch = isTrue ? ifStmt.thenBranch : ifStmt.elseBranch;
 		if(branch != null && branch.body.length > 0) {
-			this.evalNodeBody(this.get_currentScope().beat,branch,branch.body,null,next);
+			this.evalNodeBody(this.get_currentScope().beat,branch,branch.body,null,null,null,next);
 		} else {
 			next();
 		}
@@ -8606,14 +8830,14 @@ class loreline_Interpreter {
 			let idx = visitCount < alt.items.length ? visitCount : alt.items.length - 1;
 			this.setAlternativeVisitCount(alt,visitCount + 1);
 			let item = alt.items[idx];
-			this.evalNodeBody(this.get_currentScope().beat,item,item.body,null,next);
+			this.evalNodeBody(this.get_currentScope().beat,item,item.body,null,null,null,next);
 			break;
 		case 1:
 			let visitCount1 = this.getAlternativeVisitCount(alt);
 			let idx1 = visitCount1 % alt.items.length;
 			this.setAlternativeVisitCount(alt,visitCount1 + 1);
 			let item1 = alt.items[idx1];
-			this.evalNodeBody(this.get_currentScope().beat,item1,item1.body,null,next);
+			this.evalNodeBody(this.get_currentScope().beat,item1,item1.body,null,null,null,next);
 			break;
 		case 2:
 			let visitCount2 = this.getAlternativeVisitCount(alt);
@@ -8623,12 +8847,12 @@ class loreline_Interpreter {
 			}
 			this.setAlternativeVisitCount(alt,visitCount2 + 1);
 			let item2 = alt.items[visitCount2];
-			this.evalNodeBody(this.get_currentScope().beat,item2,item2.body,null,next);
+			this.evalNodeBody(this.get_currentScope().beat,item2,item2.body,null,null,null,next);
 			break;
 		case 3:
 			let idx2 = this.builtins.random(0,alt.items.length - 1);
 			let item3 = alt.items[idx2];
-			this.evalNodeBody(this.get_currentScope().beat,item3,item3.body,null,next);
+			this.evalNodeBody(this.get_currentScope().beat,item3,item3.body,null,null,null,next);
 			break;
 		case 4:
 			let _g = [];
@@ -8658,7 +8882,7 @@ class loreline_Interpreter {
 		}
 		let item = alt.items[indices[idx]];
 		let _gthis = this;
-		this.evalNodeBody(this.get_currentScope().beat,item,item.body,null,function() {
+		this.evalNodeBody(this.get_currentScope().beat,item,item.body,null,null,null,function() {
 			_gthis.evalShuffledItems(alt,indices,idx + 1,next);
 		});
 	}
@@ -8835,7 +9059,16 @@ class loreline_Interpreter {
 			scopeLevel = -1;
 		}
 		if(((node) instanceof loreline_NCall)) {
-			return this.resolveBeatFromCall(node,scopeLevel) != null;
+			return this.resolveBeatRefFromCall(node) != null;
+		}
+		return false;
+	}
+	isDynamicCallForm(call) {
+		if(((call.target) instanceof loreline_NAccess)) {
+			let access = call.target;
+			if(access.target == null && access.name == "call") {
+				return !this.resolvesExistingBinding("call");
+			}
 		}
 		return false;
 	}
@@ -8843,65 +9076,171 @@ class loreline_Interpreter {
 		if(scopeLevel == null) {
 			scopeLevel = -1;
 		}
-		let i = scopeLevel == -1 ? this.stack.length - 1 : scopeLevel;
-		while(i >= 0) {
-			let b = this.stack[i].beatByName(name);
+		let result = null;
+		this.eachResolutionScope(scopeLevel,function(scope) {
+			let b = scope.beatByName(name);
 			if(b != null) {
-				return b;
+				result = b;
+				return true;
 			}
-			--i;
+			return false;
+		});
+		if(result != null) {
+			return result;
 		}
 		return this.topLevelBeats.h[name];
 	}
-	resolveBeatFromCall(call,scopeLevel) {
-		if(scopeLevel == null) {
-			scopeLevel = -1;
+	resolveBeatRefByName(name) {
+		let result = null;
+		let walk = null;
+		walk = function(scopes,startIndex) {
+			let i = startIndex;
+			while(i >= 0) {
+				let scope = scopes[i];
+				let b = scope.beatByName(name);
+				if(b != null) {
+					result = new loreline_RuntimeBeatRef(b,scopes.slice(0,i + 1));
+					return;
+				}
+				if(scope.captured != null) {
+					walk(scope.captured,scope.captured.length - 1);
+					return;
+				}
+				--i;
+			}
+		};
+		walk(this.stack,this.stack.length - 1);
+		if(result != null) {
+			return result;
+		}
+		let topLevel = this.topLevelBeats.h[name];
+		if(topLevel != null) {
+			return new loreline_RuntimeBeatRef(topLevel,[]);
+		}
+		return null;
+	}
+	resolveBeatRefFromNode(name,node) {
+		if(node == null) {
+			return this.resolveBeatRefByName(name);
 		}
+		let lexical = this.lens.findBeatByNameFromNode(name,node);
+		if(lexical == null) {
+			return null;
+		}
+		return new loreline_RuntimeBeatRef(lexical,this.captureChainForBeat(lexical));
+	}
+	captureChainForBeat(beat) {
+		let parentBeat = this.lens.getFirstParentOfType(beat,loreline_NBeatDecl);
+		if(parentBeat == null) {
+			return [];
+		}
+		let result = null;
+		let walk = null;
+		walk = function(scopes,startIndex) {
+			let i = startIndex;
+			let parentMatch = -1;
+			while(i >= 0) {
+				let scope = scopes[i];
+				if(scope.beats != null && scope.beats.indexOf(beat) != -1) {
+					result = scopes.slice(0,i + 1);
+					return;
+				}
+				if(parentMatch == -1 && scope.beat == parentBeat) {
+					parentMatch = i;
+				}
+				if(scope.captured != null) {
+					walk(scope.captured,scope.captured.length - 1);
+					if(result == null && parentMatch != -1) {
+						result = scopes.slice(0,parentMatch + 1);
+					}
+					return;
+				}
+				--i;
+			}
+			if(result == null && parentMatch != -1) {
+				result = scopes.slice(0,parentMatch + 1);
+			}
+		};
+		walk(this.stack,this.stack.length - 1);
+		if(result != null) {
+			return result;
+		} else {
+			return [];
+		}
+	}
+	resolveDynamicBeatTarget(value,node) {
+		if(((value) instanceof loreline_RuntimeBeatRef)) {
+			return value;
+		}
+		if(((value) instanceof loreline_NBeatDecl)) {
+			return new loreline_RuntimeBeatRef(value,[]);
+		}
+		if(typeof(value) == "string") {
+			let name = value;
+			let resolved = this.resolveBeatRefFromNode(name,node);
+			if(resolved == null) {
+				throw haxe_Exception.thrown(this.beatNotFoundError(name,node));
+			}
+			return resolved;
+		}
+		throw haxe_Exception.thrown(new loreline_RuntimeError("Invalid dynamic beat target: " + this.valueToString(value),node.pos));
+	}
+	beatNotFoundError(name,node) {
+		let pos = node != null ? node.pos : this.script.pos;
+		let _g = 0;
+		let _g1 = this.lens.getNodesOfType(loreline_NBeatDecl,true);
+		while(_g < _g1.length) {
+			let decl = _g1[_g];
+			++_g;
+			if(decl.name == name) {
+				return new loreline_RuntimeError("Beat " + name + " is not visible from this scope. Store a reference (ref = " + name + ") while it is in scope to use it from elsewhere.",pos);
+			}
+		}
+		return new loreline_RuntimeError("Beat " + name + " not found",pos);
+	}
+	resolveBeatRefFromCall(call) {
 		if(((call.target) instanceof loreline_NAccess)) {
 			let access = call.target;
 			if(access.target == null) {
-				let resolvedBeat = this.resolveBeatByName(access.name,scopeLevel);
-				if(resolvedBeat != null) {
-					return resolvedBeat;
-				}
+				return this.resolveBeatRefFromNode(access.name,access);
 			}
 		}
 		return null;
 	}
 	evalCall(call,next) {
-		let resolvedBeat = this.resolveBeatFromCall(call);
-		if(resolvedBeat != null) {
-			this.evalBeatRun(resolvedBeat,next);
+		let resolvedRef = this.resolveBeatRefFromCall(call);
+		if(resolvedRef != null) {
+			let argValues = this.evaluateBeatArgs(resolvedRef.beat,call.args,call.pos);
+			this.evalBeatRun(resolvedRef.beat,next,argValues,resolvedRef.stack.length > 0 ? resolvedRef.stack : null);
 			return;
 		}
 		this.evaluateFunctionCall(call,next);
 	}
 	evalTransition(transition) {
-		let beatName = transition.target;
-		if(beatName == ".") {
-			this.finish();
-			return;
-		}
-		let resolvedBeat = null;
-		let i = this.stack.length - 1;
-		while(i >= 0) {
-			let scope = this.stack[i];
-			let beatInScope = scope.beatByName(beatName);
-			if(beatInScope != null) {
-				resolvedBeat = beatInScope;
-				break;
+		let resolvedRef = null;
+		if(transition.targetExpr != null) {
+			let value = this.evaluateExpression(transition.targetExpr);
+			if(typeof(value) == "string" && value == ".") {
+				if(transition.args != null && transition.args.length > 0) {
+					throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot pass arguments when ending the script",transition.pos));
+				}
+				this.finish();
+				return;
 			}
-			--i;
-		}
-		if(resolvedBeat == null) {
-			if(Object.prototype.hasOwnProperty.call(this.topLevelBeats.h,beatName)) {
-				resolvedBeat = this.topLevelBeats.h[beatName];
+			resolvedRef = this.resolveDynamicBeatTarget(value,transition);
+		} else {
+			let beatName = transition.target;
+			if(beatName == ".") {
+				this.finish();
+				return;
+			}
+			resolvedRef = this.resolveBeatRefFromNode(beatName,transition);
+			if(resolvedRef == null) {
+				throw haxe_Exception.thrown(this.beatNotFoundError(beatName,transition));
 			}
 		}
-		if(resolvedBeat == null) {
-			throw haxe_Exception.thrown(new loreline_RuntimeError("Beat " + beatName + " not found",this.script.pos));
-		}
-		this.transitionToBeat(resolvedBeat);
+		let argValues = this.evaluateBeatArgs(resolvedRef.beat,transition.args,transition.pos);
+		this.transitionToBeat(resolvedRef.beat,argValues,resolvedRef.stack.length > 0 ? resolvedRef.stack : null);
 	}
 	getTranslatedString(node,str) {
 		if(this.translations != null) {
@@ -8981,7 +9320,8 @@ class loreline_Interpreter {
 				if(!keepIndents) {
 					text = this.stripStringIndent(text);
 				}
-				let len = text.length;
+				let chars = text;
+				let len = chars.length;
 				if(len > 0) {
 					keepWhitespace = true;
 				}
@@ -8992,7 +9332,7 @@ class loreline_Interpreter {
 				let _g3 = len;
 				while(_g1 < _g3) {
 					let i = _g1++;
-					let c = HxOverrides.cca(text,i);
+					let c = HxOverrides.cca(chars,i);
 					let c1 = c == null ? -1 : c;
 					if(escaped) {
 						if(c1 == 110) {
@@ -9306,15 +9646,16 @@ class loreline_Interpreter {
 		return content;
 	}
 	stripStringComments(content) {
+		let chars = content;
 		let result_b = "";
-		let len = content.length;
+		let len = chars.length;
 		let i = 0;
 		while(i < len) {
-			let c = HxOverrides.cca(content,i);
+			let c = HxOverrides.cca(chars,i);
 			let c1 = c == null ? -1 : c;
 			let tmp;
 			if(c1 == 47 && i + 1 < len) {
-				let c = HxOverrides.cca(content,i + 1);
+				let c = HxOverrides.cca(chars,i + 1);
 				tmp = (c == null ? -1 : c) == 47;
 			} else {
 				tmp = false;
@@ -9323,7 +9664,7 @@ class loreline_Interpreter {
 				while(true) {
 					let tmp;
 					if(i < len) {
-						let c = HxOverrides.cca(content,i);
+						let c = HxOverrides.cca(chars,i);
 						tmp = (c == null ? -1 : c) != 10;
 					} else {
 						tmp = false;
@@ -9337,7 +9678,7 @@ class loreline_Interpreter {
 			}
 			let tmp1;
 			if(c1 == 47 && i + 1 < len) {
-				let c = HxOverrides.cca(content,i + 1);
+				let c = HxOverrides.cca(chars,i + 1);
 				tmp1 = (c == null ? -1 : c) == 42;
 			} else {
 				tmp1 = false;
@@ -9345,7 +9686,7 @@ class loreline_Interpreter {
 			if(tmp1) {
 				let hadSpaceBefore;
 				if(i > 0) {
-					let c = HxOverrides.cca(content,i - 1);
+					let c = HxOverrides.cca(chars,i - 1);
 					hadSpaceBefore = (c == null ? -1 : c) == 32;
 				} else {
 					hadSpaceBefore = false;
@@ -9355,9 +9696,9 @@ class loreline_Interpreter {
 					let tmp;
 					if(i + 1 < len) {
 						let tmp1;
-						let c = HxOverrides.cca(content,i);
+						let c = HxOverrides.cca(chars,i);
 						if((c == null ? -1 : c) == 42) {
-							let c = HxOverrides.cca(content,i + 1);
+							let c = HxOverrides.cca(chars,i + 1);
 							tmp1 = (c == null ? -1 : c) == 47;
 						} else {
 							tmp1 = false;
@@ -9374,7 +9715,7 @@ class loreline_Interpreter {
 				i += 2;
 				let hasSpaceAfter;
 				if(i < len) {
-					let c = HxOverrides.cca(content,i);
+					let c = HxOverrides.cca(chars,i);
 					hasSpaceAfter = (c == null ? -1 : c) == 32;
 				} else {
 					hasSpaceAfter = false;
@@ -9408,10 +9749,104 @@ class loreline_Interpreter {
 			return value != null;
 		}
 	}
+	callFunctionValue(fn,args,pos,next) {
+		try {
+			let result = fn.apply(null,args);
+			if(result != null && ((result) instanceof loreline_Async)) {
+				if(next == null) {
+					throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot call async function in expression",pos));
+				} else {
+					let asyncResult = result;
+					asyncResult.func(next);
+				}
+			} else if(next != null) {
+				next();
+			}
+			return result;
+		} catch( _g ) {
+			let e = haxe_Exception.caught(_g).unwrap();
+			if(((e) instanceof loreline_lorscript_Error)) {
+				let lorscriptErr = e;
+				throw haxe_Exception.thrown(new loreline_RuntimeError("Error when evaluating function (" + lorscriptErr.pmin + "-" + lorscriptErr.pmax + "): " + Std.string(lorscriptErr.e),pos));
+			}
+			throw haxe_Exception.thrown(new loreline_RuntimeError("Error when calling function: " + Std.string(e),pos));
+		}
+	}
+	resolvesExistingBinding(name) {
+		let found = false;
+		let _gthis = this;
+		this.eachResolutionScope(-1,function(scope) {
+			if(scope.state != null && loreline_Objects.fieldExists(_gthis,scope.state.fields,name)) {
+				found = true;
+				return true;
+			}
+			if(scope.node != null) {
+				let key = scope.node.id.thisVal;
+				let stateInNode = _gthis.nodeStates.map._get(key.high,key.low);
+				if(stateInNode != null && loreline_Objects.fieldExists(_gthis,stateInNode.fields,name)) {
+					found = true;
+					return true;
+				}
+			}
+			return false;
+		});
+		if(found) {
+			return true;
+		}
+		if(loreline_Objects.fieldExists(this,this.topLevelState.fields,name)) {
+			return true;
+		}
+		if(Object.prototype.hasOwnProperty.call(this.topLevelCharacters.h,name)) {
+			return true;
+		}
+		if(Object.prototype.hasOwnProperty.call(this.topLevelFunctions.h,name)) {
+			return true;
+		}
+		if(this.resolveBeatByName(name) != null) {
+			return true;
+		}
+		return false;
+	}
+	evaluateDynamicCall(call,next) {
+		if(call.args.length == 0) {
+			throw haxe_Exception.thrown(new loreline_RuntimeError("call() requires a target argument",call.pos));
+		}
+		let targetValue = this.evaluateExpression(call.args[0]);
+		if(loreline_RuntimeBeatRef.beatOf(targetValue) != null) {
+			throw haxe_Exception.thrown(new loreline_RuntimeError("call() can only call functions. Use beat(...) to call a beat.",call.pos));
+		}
+		let fn = null;
+		if(Reflect.isFunction(targetValue)) {
+			fn = targetValue;
+		} else if(typeof(targetValue) == "string") {
+			let name = targetValue;
+			if(this.resolveBeatByName(name) != null) {
+				throw haxe_Exception.thrown(new loreline_RuntimeError("call() can only call functions. Use beat(...) to call a beat.",call.pos));
+			}
+			if(Object.prototype.hasOwnProperty.call(this.topLevelFunctions.h,name)) {
+				fn = this.topLevelFunctions.h[name];
+			}
+		}
+		if(fn != null) {
+			let _g = [];
+			let _g1 = 1;
+			let _g2 = call.args.length;
+			while(_g1 < _g2) {
+				let i = _g1++;
+				_g.push(this.evaluateExpression(call.args[i]));
+			}
+			let values = _g;
+			return this.callFunctionValue(fn,values,call.pos,next);
+		}
+		throw haxe_Exception.thrown(new loreline_RuntimeError("call() target is not a function: " + this.valueToString(targetValue),call.pos));
+	}
 	evaluateFunctionCall(call,next) {
 		if(((call.target) instanceof loreline_NAccess)) {
 			let access = call.target;
 			if(access.target == null) {
+				if(access.name == "call" && !this.resolvesExistingBinding("call")) {
+					return this.evaluateDynamicCall(call,next);
+				}
 				let target = this.evaluateExpression(call.target);
 				if(target != null) {
 					if(Reflect.isFunction(target)) {
@@ -9424,37 +9859,18 @@ class loreline_Interpreter {
 							_g.push(this.evaluateExpression(arg));
 						}
 						let args = _g;
-						try {
-							let result = target.apply(null,args);
-							if(result != null && ((result) instanceof loreline_Async)) {
-								if(next == null) {
-									throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot call async function in expression",call.pos));
-								} else {
-									let asyncResult = result;
-									asyncResult.func(next);
-								}
-							} else if(next != null) {
-								next();
-							}
-							return result;
-						} catch( _g ) {
-							let e = haxe_Exception.caught(_g).unwrap();
-							if(((e) instanceof loreline_lorscript_Error)) {
-								let lorscriptErr = e;
-								throw haxe_Exception.thrown(new loreline_RuntimeError("Error when evaluating function (" + lorscriptErr.pmin + "-" + lorscriptErr.pmax + "): " + Std.string(lorscriptErr.e),call.pos));
-							}
-							throw haxe_Exception.thrown(new loreline_RuntimeError("Error when calling function: " + Std.string(e),call.pos));
-						}
+						return this.callFunctionValue(target,args,call.pos,next);
 					}
 				}
 			} else {
 				let obj = this.evaluateExpression(access.target);
 				let helper = null;
+				let objBeat = loreline_RuntimeBeatRef.beatOf(obj);
 				if(typeof(obj) == "string") {
 					helper = loreline_Objects.getStringHelper(this,access.name);
 				} else if(loreline_Arrays.isArray(obj)) {
 					helper = loreline_Objects.getArrayHelper(this,access.name);
-				} else if(((obj) instanceof loreline_NBeatDecl)) {
+				} else if(objBeat != null) {
 					helper = loreline_Objects.getBeatHelper(this,access.name);
 				} else if(loreline_Objects.isFields(obj)) {
 					helper = loreline_Objects.getMapHelper(this,access.name);
@@ -9469,7 +9885,7 @@ class loreline_Interpreter {
 						_g.push(this.evaluateExpression(arg));
 					}
 					let args = _g;
-					args.splice(0,0,obj);
+					args.splice(0,0,objBeat != null ? objBeat : obj);
 					let result = helper.apply(null,args);
 					if(result != null && ((result) instanceof loreline_Async)) {
 						if(next == null) {
@@ -9531,14 +9947,12 @@ class loreline_Interpreter {
 		return _g;
 	}
 	evaluateObjectLiteral(expr) {
-		let obj = new haxe_ds_StringMap();
+		let obj = { };
 		let _g = 0;
 		while(_g < expr.length) {
 			let field = expr[_g];
 			++_g;
-			let key = field.name;
-			let value = this.evaluateExpression(field.value);
-			obj.h[key] = value;
+			obj[field.name] = this.evaluateExpression(field.value);
 		}
 		return obj;
 	}
@@ -9693,8 +10107,8 @@ class loreline_Interpreter {
 			break;
 		case 4:
 			let pos4 = access.pos;
-			let beat = access.beat;
-			return beat;
+			let ref = access.ref;
+			return ref;
 		}
 	}
 	writeAccess(access,value) {
@@ -9724,8 +10138,8 @@ class loreline_Interpreter {
 			throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot overwrite function: " + name2,pos3));
 		case 4:
 			let pos4 = access.pos;
-			let beat = access.beat;
-			throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot overwrite beat: " + beat.name,pos4));
+			let ref = access.ref;
+			throw haxe_Exception.thrown(new loreline_RuntimeError("Cannot overwrite beat: " + ref.beat.name,pos4));
 		}
 	}
 	resolveAssignmentTarget(target) {
@@ -9762,42 +10176,47 @@ class loreline_Interpreter {
 			}
 			return loreline_RuntimeAccess.FieldAccess(target.pos,evaluated,name);
 		}
-		let i = this.stack.length - 1;
-		while(i >= 0) {
-			let scope = this.stack[i];
+		let scopeAccess = null;
+		let _gthis = this;
+		this.eachResolutionScope(-1,function(scope) {
 			if(scope.state != null) {
-				if(loreline_Objects.fieldExists(this,scope.state.fields,name)) {
+				if(loreline_Objects.fieldExists(_gthis,scope.state.fields,name)) {
 					let tmp = access != null ? access.pos : null;
 					let tmp1;
 					if(tmp != null) {
 						tmp1 = tmp;
 					} else {
-						let tmp = this.get_currentScope();
+						let tmp = _gthis.get_currentScope();
 						let tmp2 = tmp != null ? tmp.node : null;
 						tmp1 = tmp2 != null ? tmp2.pos : null;
 					}
-					return loreline_RuntimeAccess.FieldAccess(tmp1 != null ? tmp1 : this.script.pos,scope.state.fields,name);
+					scopeAccess = loreline_RuntimeAccess.FieldAccess(tmp1 != null ? tmp1 : _gthis.script.pos,scope.state.fields,name);
+					return true;
 				}
 			}
 			if(scope.node != null) {
 				let key = scope.node.id.thisVal;
-				let stateInNode = this.nodeStates.map._get(key.high,key.low);
+				let stateInNode = _gthis.nodeStates.map._get(key.high,key.low);
 				if(stateInNode != null) {
-					if(loreline_Objects.fieldExists(this,stateInNode.fields,name)) {
+					if(loreline_Objects.fieldExists(_gthis,stateInNode.fields,name)) {
 						let tmp = access != null ? access.pos : null;
 						let tmp1;
 						if(tmp != null) {
 							tmp1 = tmp;
 						} else {
-							let tmp = this.get_currentScope();
+							let tmp = _gthis.get_currentScope();
 							let tmp2 = tmp != null ? tmp.node : null;
 							tmp1 = tmp2 != null ? tmp2.pos : null;
 						}
-						return loreline_RuntimeAccess.FieldAccess(tmp1 != null ? tmp1 : this.script.pos,stateInNode.fields,name);
+						scopeAccess = loreline_RuntimeAccess.FieldAccess(tmp1 != null ? tmp1 : _gthis.script.pos,stateInNode.fields,name);
+						return true;
 					}
 				}
 			}
-			--i;
+			return false;
+		});
+		if(scopeAccess != null) {
+			return scopeAccess;
 		}
 		if(loreline_Objects.fieldExists(this,this.topLevelState.fields,name)) {
 			let tmp = access != null ? access.pos : null;
@@ -9835,8 +10254,8 @@ class loreline_Interpreter {
 			}
 			return loreline_RuntimeAccess.FunctionAccess(tmp1 != null ? tmp1 : this.script.pos,name);
 		}
-		let beat = this.resolveBeatByName(name);
-		if(beat != null) {
+		let beatRef = this.resolveBeatRefFromNode(name,access);
+		if(beatRef != null) {
 			let tmp = access != null ? access.pos : null;
 			let tmp1;
 			if(tmp != null) {
@@ -9846,7 +10265,7 @@ class loreline_Interpreter {
 				let tmp2 = tmp != null ? tmp.node : null;
 				tmp1 = tmp2 != null ? tmp2.pos : null;
 			}
-			return loreline_RuntimeAccess.BeatAccess(tmp1 != null ? tmp1 : this.script.pos,beat);
+			return loreline_RuntimeAccess.BeatAccess(tmp1 != null ? tmp1 : this.script.pos,beatRef);
 		}
 		if(!this.strictAccess) {
 			let tmp = access != null ? access.pos : null;
@@ -9860,16 +10279,17 @@ class loreline_Interpreter {
 			}
 			return loreline_RuntimeAccess.FieldAccess(tmp1 != null ? tmp1 : this.script.pos,this.topLevelState.fields,name);
 		}
-		let tmp = access != null ? access.pos : null;
-		let tmp1;
-		if(tmp != null) {
-			tmp1 = tmp;
+		let tmp = "Undefined variable: " + name;
+		let tmp1 = access != null ? access.pos : null;
+		let tmp2;
+		if(tmp1 != null) {
+			tmp2 = tmp1;
 		} else {
 			let tmp = this.get_currentScope();
-			let tmp2 = tmp != null ? tmp.node : null;
-			tmp1 = tmp2 != null ? tmp2.pos : null;
+			let tmp1 = tmp != null ? tmp.node : null;
+			tmp2 = tmp1 != null ? tmp1.pos : null;
 		}
-		throw haxe_Exception.thrown(new loreline_RuntimeError("Undefined variable: " + name,tmp1 != null ? tmp1 : this.script.pos));
+		throw haxe_Exception.thrown(new loreline_RuntimeError(tmp,tmp2 != null ? tmp2 : this.script.pos));
 	}
 	getTypeName(t) {
 		switch(t._hx_index) {
@@ -10143,7 +10563,9 @@ class loreline_Interpreter {
 			}
 			break;
 		case 31:case 32:
-			let result = ((left) instanceof loreline_NBeatDecl) && typeof(right) == "string" ? left.name == right : typeof(left) == "string" && ((right) instanceof loreline_NBeatDecl) ? left == right.name : ((left) instanceof loreline_NBeatDecl) && ((right) instanceof loreline_NBeatDecl) ? left.name == right.name : left == right;
+			let leftBeat = loreline_RuntimeBeatRef.beatOf(left);
+			let rightBeat = loreline_RuntimeBeatRef.beatOf(right);
+			let result = leftBeat != null && typeof(right) == "string" ? leftBeat.name == right : typeof(left) == "string" && rightBeat != null ? left == rightBeat.name : leftBeat != null && rightBeat != null ? leftBeat.name == rightBeat.name : left == right;
 			switch(op._hx_index) {
 			case 31:
 				return result;
@@ -10363,9 +10785,10 @@ class loreline_Interpreter {
 			seen.pop();
 			return buf_b;
 		}
-		if(((value) instanceof loreline_NBeatDecl)) {
+		let asBeat = loreline_RuntimeBeatRef.beatOf(value);
+		if(asBeat != null) {
 			seen.pop();
-			return value.name;
+			return asBeat.name;
 		}
 		if(loreline_Objects.isFields(value)) {
 			let keys = loreline_Objects.getFields(this,value);
@@ -10475,6 +10898,8 @@ class loreline_JsonToAst {
 			return loreline_JsonToAst.assignFromJson(json);
 		case "Beat":
 			return loreline_JsonToAst.beatFromJson(json);
+		case "BeatCall":
+			return loreline_JsonToAst.beatCallFromJson(json);
 		case "Binary":
 			return loreline_JsonToAst.binaryFromJson(json);
 		case "Block":
@@ -10585,6 +11010,17 @@ class loreline_JsonToAst {
 		let comments = loreline_JsonToAst.extractComments(json);
 		let node = new loreline_NBeatDecl(id,pos,json.name,body,comments.leading,comments.trailing);
 		node.style = loreline_JsonToAst.blockStyleFromString(json.style);
+		if(json.params != null) {
+			let paramsArr = json.params;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < paramsArr.length) {
+				let p = paramsArr[_g1];
+				++_g1;
+				_g.push(new loreline_NBeatParam(p.name,loreline_JsonToAst.positionFromJson(p.namePos),p.defaultValue != null ? loreline_JsonToAst.nodeFromJson(p.defaultValue) : null));
+			}
+			node.params = _g;
+		}
 		return node;
 	}
 	static stringPartFromJson(json) {
@@ -10833,14 +11269,64 @@ class loreline_JsonToAst {
 		let pos = loreline_JsonToAst.positionFromJson(json.pos);
 		let targetPos = loreline_JsonToAst.positionFromJson(json.targetPos);
 		let comments = loreline_JsonToAst.extractComments(json);
-		return new loreline_NTransition(id,pos,json.target,targetPos,comments.leading,comments.trailing);
+		let node = new loreline_NTransition(id,pos,json.target,targetPos,comments.leading,comments.trailing);
+		if(json.targetExpr != null) {
+			node.targetExpr = loreline_JsonToAst.nodeFromJson(json.targetExpr);
+		}
+		if(json.args != null) {
+			let argsArr = json.args;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < argsArr.length) {
+				let a = argsArr[_g1];
+				++_g1;
+				_g.push(loreline_JsonToAst.nodeFromJson(a));
+			}
+			node.args = _g;
+		}
+		return node;
+	}
+	static beatCallFromJson(json) {
+		let id = loreline_JsonToAst.idFromJson(json);
+		let pos = loreline_JsonToAst.positionFromJson(json.pos);
+		let targetPos = loreline_JsonToAst.positionFromJson(json.targetPos);
+		let targetExpr = loreline_JsonToAst.nodeFromJson(json.targetExpr);
+		let comments = loreline_JsonToAst.extractComments(json);
+		let node = new loreline_NBeatCall(id,pos,targetExpr,targetPos,comments.leading,comments.trailing);
+		if(json.args != null) {
+			let argsArr = json.args;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < argsArr.length) {
+				let a = argsArr[_g1];
+				++_g1;
+				_g.push(loreline_JsonToAst.nodeFromJson(a));
+			}
+			node.args = _g;
+		}
+		return node;
 	}
 	static insertionFromJson(json) {
 		let id = loreline_JsonToAst.idFromJson(json);
 		let pos = loreline_JsonToAst.positionFromJson(json.pos);
 		let targetPos = loreline_JsonToAst.positionFromJson(json.targetPos);
 		let comments = loreline_JsonToAst.extractComments(json);
-		return new loreline_NInsertion(id,pos,json.target,targetPos,comments.leading,comments.trailing);
+		let node = new loreline_NInsertion(id,pos,json.target,targetPos,comments.leading,comments.trailing);
+		if(json.targetExpr != null) {
+			node.targetExpr = loreline_JsonToAst.nodeFromJson(json.targetExpr);
+		}
+		if(json.args != null) {
+			let argsArr = json.args;
+			let _g = [];
+			let _g1 = 0;
+			while(_g1 < argsArr.length) {
+				let a = argsArr[_g1];
+				++_g1;
+				_g.push(loreline_JsonToAst.nodeFromJson(a));
+			}
+			node.args = _g;
+		}
+		return node;
 	}
 	static functionDeclFromJson(json) {
 		let id = loreline_JsonToAst.idFromJson(json);
@@ -11138,7 +11624,7 @@ class loreline_FuncLorscript {
 			let e = haxe_Exception.caught(_g).unwrap();
 			if(((e) instanceof loreline_Error)) {
 				this.error = e;
-				this.error.pos = func.pos.withOffset(this.codeToLorscript.input,this.error.pos.offset,this.error.pos.length,func.pos.offset);
+				this.error.pos = func.pos.withOffset(this.codeToLorscript.inputText,this.error.pos.offset,this.error.pos.length,func.pos.offset);
 			}
 			this.lorscript = this.codeToLorscript.output.b;
 		}
@@ -11199,7 +11685,7 @@ class loreline_FuncLorscript {
 					this.error = new loreline_WrappedError(lorscriptError,tmp,this.codeToLorscript.toLorelinePos(func.pos,lorscriptError.pmin,lorscriptError.pmax));
 				} else if(((e) instanceof loreline_Error)) {
 					this.error = e;
-					this.error.pos = func.pos.withOffset(this.codeToLorscript.input,this.error.pos.offset,this.error.pos.length,func.pos.offset);
+					this.error.pos = func.pos.withOffset(this.codeToLorscript.inputText,this.error.pos.offset,this.error.pos.length,func.pos.offset);
 				}
 			}
 			try {
@@ -12247,10 +12733,88 @@ class loreline_Lens {
 		}
 		return null;
 	}
+	findBeatParamFromAccess(access) {
+		if(access.target != null || access.name == null) {
+			return null;
+		}
+		let parentBeat = this.getFirstParentOfType(access,loreline_NBeatDecl);
+		while(parentBeat != null) {
+			if(parentBeat.params != null) {
+				let _g = 0;
+				let _g1 = parentBeat.params;
+				while(_g < _g1.length) {
+					let param = _g1[_g];
+					++_g;
+					if(param.name == access.name) {
+						return { param : param, beat : parentBeat};
+					}
+				}
+			}
+			parentBeat = this.getFirstParentOfType(parentBeat,loreline_NBeatDecl);
+		}
+		return null;
+	}
+	findCallArgument(node) {
+		let child = node;
+		let parent = this.getParentNode(child);
+		while(parent != null) {
+			switch(js_Boot.getClass(parent)) {
+			case loreline_NBeatCall:
+				let beatCall = parent;
+				if(beatCall.args != null) {
+					let index = beatCall.args.indexOf(child);
+					if(index != -1) {
+						return { owner : parent, index : index};
+					}
+				}
+				return null;
+			case loreline_NCall:
+				let call = parent;
+				if(call.args != null) {
+					let index = call.args.indexOf(child);
+					if(index != -1) {
+						return { owner : parent, index : index};
+					}
+				}
+				return null;
+			case loreline_NInsertion:
+				let insertion = parent;
+				if(insertion.args != null) {
+					let index = insertion.args.indexOf(child);
+					if(index != -1) {
+						return { owner : parent, index : index};
+					}
+				}
+				return null;
+			case loreline_NTransition:
+				let transition = parent;
+				if(transition.args != null) {
+					let index = transition.args.indexOf(child);
+					if(index != -1) {
+						return { owner : parent, index : index};
+					}
+				}
+				return null;
+			default:
+				if(!((parent) instanceof loreline_NExpr)) {
+					return null;
+				}
+			}
+			child = parent;
+			parent = this.getParentNode(child);
+		}
+		return null;
+	}
 	findBeatFromTransition(transition) {
+		if(transition.targetExpr != null) {
+			return null;
+		}
 		return this.findBeatByNameFromNode(transition.target,transition);
 	}
 	findBeatFromInsertion(insertion) {
+		if(insertion.targetExpr != null) {
+			return null;
+		}
 		return this.findBeatByNameFromNode(insertion.target,insertion);
 	}
 	findBeatByPathFromNode(path,node) {
@@ -12559,22 +13123,26 @@ class loreline_Lens {
 				break;
 			case loreline_NInsertion:
 				let insertion = node;
-				let targetBeat = _gthis.findBeatByNameFromNode(insertion.target,insertion);
-				if(targetBeat != null) {
-					let key = targetBeat.id;
-					let value = new loreline_Reference(targetBeat,insertion);
-					let key1 = key.thisVal;
-					targetBeats_map._set(key1.high,key1.low,value);
+				if(insertion.targetExpr == null) {
+					let targetBeat = _gthis.findBeatByNameFromNode(insertion.target,insertion);
+					if(targetBeat != null) {
+						let key = targetBeat.id;
+						let value = new loreline_Reference(targetBeat,insertion);
+						let key1 = key.thisVal;
+						targetBeats_map._set(key1.high,key1.low,value);
+					}
 				}
 				break;
 			case loreline_NTransition:
 				let transition = node;
-				let targetBeat1 = _gthis.findBeatByNameFromNode(transition.target,transition);
-				if(targetBeat1 != null) {
-					let key = targetBeat1.id;
-					let value = new loreline_Reference(targetBeat1,transition);
-					let key1 = key.thisVal;
-					targetBeats_map._set(key1.high,key1.low,value);
+				if(transition.targetExpr == null) {
+					let targetBeat = _gthis.findBeatByNameFromNode(transition.target,transition);
+					if(targetBeat != null) {
+						let key = targetBeat.id;
+						let value = new loreline_Reference(targetBeat,transition);
+						let key1 = key.thisVal;
+						targetBeats_map._set(key1.high,key1.low,value);
+					}
 				}
 				break;
 			default:
@@ -13811,7 +14379,54 @@ class loreline_Lexer {
 				this.nextBlock = 3;
 				break;
 			case 2:
-				this.nextBlock = 7;
+				let prevIndex = tokens.length - 2;
+				_hx_loop3: while(prevIndex >= 0) {
+					let _g = tokens[prevIndex].type;
+					switch(_g._hx_index) {
+					case 51:
+						let _g1 = _g.content;
+						--prevIndex;
+						break;
+					case 52:
+						let _g2 = _g.content;
+						--prevIndex;
+						break;
+					default:
+						break _hx_loop3;
+					}
+				}
+				let isDynamicTargetKeyword;
+				if(prevIndex >= 0) {
+					switch(tokens[prevIndex].type._hx_index) {
+					case 26:case 40:
+						isDynamicTargetKeyword = true;
+						break;
+					default:
+						isDynamicTargetKeyword = false;
+					}
+				} else {
+					isDynamicTargetKeyword = false;
+				}
+				let lookahead = this.pos;
+				while(lookahead < this.length) {
+					let c = HxOverrides.cca(this.input,lookahead);
+					let c1 = c == null ? -1 : c;
+					if(c1 == 32 || c1 == 9) {
+						++lookahead;
+					} else {
+						break;
+					}
+				}
+				let isBeatCallStatement;
+				if(lookahead < this.length) {
+					let c = HxOverrides.cca(this.input,lookahead);
+					isBeatCallStatement = (c == null ? -1 : c) == 40;
+				} else {
+					isBeatCallStatement = false;
+				}
+				if(!isDynamicTargetKeyword && !isBeatCallStatement) {
+					this.nextBlock = 7;
+				}
 				break;
 			case 3:
 				this.nextBlock = 5;
@@ -15701,68 +16316,33 @@ class loreline_Lexer {
 			}
 			let c1 = HxOverrides.cca(this.input,pos);
 			let c2 = c1 == null ? -1 : c1;
-			if(c2 == 46) {
-				++pos;
-				pos = this._skipWhitespaceAndComments(pos,false);
-				let result = true;
-				let len = _gthis.length;
-				if(pos >= len) {
-					result = false;
-				} else {
-					let tmp;
-					let tmp1;
-					let tmp2;
-					if(pos + 1 < len) {
-						let c = HxOverrides.cca(_gthis.input,pos);
-						tmp2 = (c == null ? -1 : c) == 111;
-					} else {
-						tmp2 = false;
-					}
-					if(tmp2) {
-						let c = HxOverrides.cca(_gthis.input,pos + 1);
-						tmp1 = (c == null ? -1 : c) == 114;
-					} else {
-						tmp1 = false;
-					}
-					if(tmp1) {
-						if(pos + 2 < len) {
-							let c = HxOverrides.cca(_gthis.input,pos + 2);
-							let c1 = c == null ? -1 : c;
-							tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
-						} else {
-							tmp = true;
-						}
-					} else {
-						tmp = false;
-					}
-					if(tmp) {
+			while(c2 == 46 || c2 == 91) {
+				if(c2 == 46) {
+					++pos;
+					pos = this._skipWhitespaceAndComments(pos,false);
+					let result = true;
+					let len = _gthis.length;
+					if(pos >= len) {
 						result = false;
 					} else {
 						let tmp;
 						let tmp1;
 						let tmp2;
-						let tmp3;
-						if(pos + 2 < len) {
+						if(pos + 1 < len) {
 							let c = HxOverrides.cca(_gthis.input,pos);
-							tmp3 = (c == null ? -1 : c) == 97;
-						} else {
-							tmp3 = false;
-						}
-						if(tmp3) {
-							let c = HxOverrides.cca(_gthis.input,pos + 1);
-							tmp2 = (c == null ? -1 : c) == 110;
+							tmp2 = (c == null ? -1 : c) == 111;
 						} else {
 							tmp2 = false;
 						}
 						if(tmp2) {
-							let c = HxOverrides.cca(_gthis.input,pos + 2);
-							tmp1 = (c == null ? -1 : c) == 100;
+							let c = HxOverrides.cca(_gthis.input,pos + 1);
+							tmp1 = (c == null ? -1 : c) == 114;
 						} else {
 							tmp1 = false;
 						}
 						if(tmp1) {
-							if(pos + 3 < len) {
-								let c = HxOverrides.cca(_gthis.input,pos + 3);
+							if(pos + 2 < len) {
+								let c = HxOverrides.cca(_gthis.input,pos + 2);
 								let c1 = c == null ? -1 : c;
 								tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
 							} else {
@@ -15774,47 +16354,77 @@ class loreline_Lexer {
 						if(tmp) {
 							result = false;
 						} else {
-							let c = HxOverrides.cca(_gthis.input,pos);
-							let c1 = c == null ? -1 : c;
-							if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95)) {
+							let tmp;
+							let tmp1;
+							let tmp2;
+							let tmp3;
+							if(pos + 2 < len) {
+								let c = HxOverrides.cca(_gthis.input,pos);
+								tmp3 = (c == null ? -1 : c) == 97;
+							} else {
+								tmp3 = false;
+							}
+							if(tmp3) {
+								let c = HxOverrides.cca(_gthis.input,pos + 1);
+								tmp2 = (c == null ? -1 : c) == 110;
+							} else {
+								tmp2 = false;
+							}
+							if(tmp2) {
+								let c = HxOverrides.cca(_gthis.input,pos + 2);
+								tmp1 = (c == null ? -1 : c) == 100;
+							} else {
+								tmp1 = false;
+							}
+							if(tmp1) {
+								if(pos + 3 < len) {
+									let c = HxOverrides.cca(_gthis.input,pos + 3);
+									let c1 = c == null ? -1 : c;
+									tmp = !(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95);
+								} else {
+									tmp = true;
+								}
+							} else {
+								tmp = false;
+							}
+							if(tmp) {
 								result = false;
 							} else {
-								++pos;
-								while(pos < _gthis.length) {
-									let c = HxOverrides.cca(_gthis.input,pos);
-									c1 = c == null ? -1 : c;
-									if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57)) {
-										break;
-									}
+								let c = HxOverrides.cca(_gthis.input,pos);
+								let c1 = c == null ? -1 : c;
+								if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95)) {
+									result = false;
+								} else {
 									++pos;
+									while(pos < _gthis.length) {
+										let c = HxOverrides.cca(_gthis.input,pos);
+										c1 = c == null ? -1 : c;
+										if(!(c1 >= 97 && c1 <= 122 || c1 >= 65 && c1 <= 90 || c1 == 95 || c1 >= 48 && c1 <= 57)) {
+											break;
+										}
+										++pos;
+									}
 								}
 							}
 						}
 					}
-				}
-				if(!result) {
-					return true;
-				}
-				pos = this._skipWhitespaceAndComments(pos,false);
-				if(pos >= this.length) {
-					return true;
-				}
-				let c = HxOverrides.cca(this.input,pos);
-				c2 = c == null ? -1 : c;
-			}
-			if(c2 == 91) {
-				++pos;
-				let bracketLevel = 1;
-				while(pos < this.length && bracketLevel > 0) {
-					let c = HxOverrides.cca(this.input,pos);
-					c2 = c == null ? -1 : c;
-					if(c2 == 91) {
-						++bracketLevel;
-					}
-					if(c2 == 93) {
-						--bracketLevel;
+					if(!result) {
+						return true;
 					}
+				} else {
 					++pos;
+					let bracketLevel = 1;
+					while(pos < this.length && bracketLevel > 0) {
+						let c = HxOverrides.cca(this.input,pos);
+						c2 = c == null ? -1 : c;
+						if(c2 == 91) {
+							++bracketLevel;
+						}
+						if(c2 == 93) {
+							--bracketLevel;
+						}
+						++pos;
+					}
 				}
 				pos = this._skipWhitespaceAndComments(pos,false);
 				if(pos >= this.length) {
@@ -16125,6 +16735,19 @@ class loreline_Lexer {
 					}
 					++pos;
 				}
+				let tmp;
+				if(pos < this.length) {
+					let c = HxOverrides.cca(this.input,pos);
+					tmp = (c == null ? -1 : c) == 40;
+				} else {
+					tmp = false;
+				}
+				if(tmp) {
+					pos = this.skipBalancedParens(pos,this.parentBlockType() == loreline_TokenType.KwBeat);
+					if(pos == -1) {
+						return false;
+					}
+				}
 			} else {
 				return false;
 			}
@@ -16172,6 +16795,19 @@ class loreline_Lexer {
 					}
 					++pos;
 				}
+				let tmp;
+				if(pos < this.length) {
+					let c = HxOverrides.cca(this.input,pos);
+					tmp = (c == null ? -1 : c) == 40;
+				} else {
+					tmp = false;
+				}
+				if(tmp) {
+					pos = this.skipBalancedParens(pos,this.parentBlockType() == loreline_TokenType.KwBeat);
+					if(pos == -1) {
+						return false;
+					}
+				}
 			} else {
 				return false;
 			}
@@ -17126,11 +17762,11 @@ class loreline_Lexer {
 			let token = this.tokenized[i];
 			let _g = token.type;
 			switch(_g._hx_index) {
+			case 2:case 48:case 50:
+				return true;
 			case 19:
 				let _g1 = _g.name;
 				return true;
-			case 48:case 50:
-				return true;
 			case 51:
 				let _g2 = _g.content;
 				break;
@@ -17463,6 +18099,97 @@ class loreline_Lexer {
 		}
 		return p;
 	}
+	skipBalancedParens(p,allowTags) {
+		let tmp;
+		if(p < this.length) {
+			let c = HxOverrides.cca(this.input,p);
+			tmp = (c == null ? -1 : c) != 40;
+		} else {
+			tmp = true;
+		}
+		if(tmp) {
+			return -1;
+		}
+		++p;
+		let depth = 1;
+		while(p < this.length && depth > 0) {
+			let c = HxOverrides.cca(this.input,p);
+			let ic = c == null ? -1 : c;
+			if(ic == 92) {
+				p += 2;
+				continue;
+			}
+			if(ic == 10) {
+				return -1;
+			}
+			let tmp;
+			if(ic == 47 && p + 1 < this.length) {
+				let c = HxOverrides.cca(this.input,p + 1);
+				tmp = (c == null ? -1 : c) == 47;
+			} else {
+				tmp = false;
+			}
+			if(tmp) {
+				return -1;
+			}
+			let tmp1;
+			if(ic == 47 && p + 1 < this.length) {
+				let c = HxOverrides.cca(this.input,p + 1);
+				tmp1 = (c == null ? -1 : c) == 42;
+			} else {
+				tmp1 = false;
+			}
+			if(tmp1) {
+				p += 2;
+				while(true) {
+					if(p >= this.length) {
+						return -1;
+					}
+					let c = HxOverrides.cca(this.input,p);
+					if((c == null ? -1 : c) == 10) {
+						return -1;
+					}
+					let tmp;
+					let tmp1;
+					if(p + 1 < this.length) {
+						let c = HxOverrides.cca(this.input,p);
+						tmp1 = (c == null ? -1 : c) == 42;
+					} else {
+						tmp1 = false;
+					}
+					if(tmp1) {
+						let c = HxOverrides.cca(this.input,p + 1);
+						tmp = (c == null ? -1 : c) == 47;
+					} else {
+						tmp = false;
+					}
+					if(tmp) {
+						p += 2;
+						break;
+					}
+					++p;
+				}
+				continue;
+			}
+			if(ic == 34) {
+				p = this.scanStringEnd(p,allowTags);
+				if(p == -1) {
+					return -1;
+				}
+				continue;
+			}
+			if(ic == 40) {
+				++depth;
+			} else if(ic == 41) {
+				--depth;
+			}
+			++p;
+		}
+		if(depth != 0) {
+			return -1;
+		}
+		return p;
+	}
 	tryReadUnquotedString() {
 		if(this.isStrict()) {
 			return null;
@@ -21808,9 +22535,35 @@ loreline_NCharacterDecl.__super__ = loreline_AstNode;
 Object.assign(loreline_NCharacterDecl.prototype, {
 	__class__: loreline_NCharacterDecl
 });
+class loreline_NBeatParam {
+	constructor(name,namePos,defaultValue) {
+		this.name = name;
+		this.namePos = namePos;
+		this.defaultValue = defaultValue;
+	}
+	toJson() {
+		let json = { name : this.name, namePos : this.namePos.toJson()};
+		if(this.defaultValue != null) {
+			json.defaultValue = this.defaultValue.toJson();
+		}
+		return json;
+	}
+}
+$hxClasses["loreline.NBeatParam"] = loreline_NBeatParam;
+loreline_NBeatParam.__name__ = "loreline.NBeatParam";
+Object.assign(loreline_NBeatParam.prototype, {
+	__class__: loreline_NBeatParam
+});
 class loreline_NBeatDecl extends loreline_AstNode {
 	constructor(id,pos,name,body,leadingComments,trailingComments) {
-		super(id,pos,leadingComments,trailingComments);
+		loreline_Node._hx_skip_constructor = true;
+		super();
+		loreline_Node._hx_skip_constructor = false;
+		this._hx_constructor(id,pos,name,body,leadingComments,trailingComments);
+	}
+	_hx_constructor(id,pos,name,body,leadingComments,trailingComments) {
+		this.params = null;
+		super._hx_constructor(id,pos,leadingComments,trailingComments);
 		this.name = name;
 		this.body = body;
 		this.style = 0;
@@ -21820,6 +22573,18 @@ class loreline_NBeatDecl extends loreline_AstNode {
 	}
 	each(handleNode) {
 		super.each(handleNode);
+		if(this.params != null) {
+			let _g = 0;
+			let _g1 = this.params;
+			while(_g < _g1.length) {
+				let param = _g1[_g];
+				++_g;
+				if(param.defaultValue != null) {
+					handleNode(param.defaultValue,this);
+					param.defaultValue.each(handleNode);
+				}
+			}
+		}
 		if(this.body != null) {
 			let _g = 0;
 			let _g1 = this.body.length;
@@ -21834,6 +22599,17 @@ class loreline_NBeatDecl extends loreline_AstNode {
 	toJson() {
 		let json = super.toJson();
 		json.name = this.name;
+		if(this.params != null) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = this.params;
+			while(_g1 < _g2.length) {
+				let param = _g2[_g1];
+				++_g1;
+				_g.push(param.toJson());
+			}
+			json.params = _g;
+		}
 		let _g = [];
 		let _g1 = 0;
 		let _g2 = this.body;
@@ -22481,17 +23257,57 @@ Object.assign(loreline_NCall.prototype, {
 });
 class loreline_NTransition extends loreline_AstNode {
 	constructor(id,pos,target,targetPos,leadingComments,trailingComments) {
-		super(id,pos,leadingComments,trailingComments);
+		loreline_Node._hx_skip_constructor = true;
+		super();
+		loreline_Node._hx_skip_constructor = false;
+		this._hx_constructor(id,pos,target,targetPos,leadingComments,trailingComments);
+	}
+	_hx_constructor(id,pos,target,targetPos,leadingComments,trailingComments) {
+		this.args = null;
+		this.targetExpr = null;
+		super._hx_constructor(id,pos,leadingComments,trailingComments);
 		this.target = target;
 		this.targetPos = targetPos;
 	}
 	type() {
 		return "Transition";
 	}
+	each(handleNode) {
+		super.each(handleNode);
+		if(this.targetExpr != null) {
+			handleNode(this.targetExpr,this);
+			this.targetExpr.each(handleNode);
+		}
+		if(this.args != null) {
+			let _g = 0;
+			let _g1 = this.args;
+			while(_g < _g1.length) {
+				let arg = _g1[_g];
+				++_g;
+				handleNode(arg,this);
+				arg.each(handleNode);
+			}
+		}
+	}
 	toJson() {
 		let json = super.toJson();
-		json.target = this.target;
+		if(this.targetExpr != null) {
+			json.targetExpr = this.targetExpr.toJson();
+		} else {
+			json.target = this.target;
+		}
 		json.targetPos = this.targetPos.toJson();
+		if(this.args != null) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = this.args;
+			while(_g1 < _g2.length) {
+				let arg = _g2[_g1];
+				++_g1;
+				_g.push(arg.toJson());
+			}
+			json.args = _g;
+		}
 		return json;
 	}
 }
@@ -22503,17 +23319,57 @@ Object.assign(loreline_NTransition.prototype, {
 });
 class loreline_NInsertion extends loreline_AstNode {
 	constructor(id,pos,target,targetPos,leadingComments,trailingComments) {
-		super(id,pos,leadingComments,trailingComments);
+		loreline_Node._hx_skip_constructor = true;
+		super();
+		loreline_Node._hx_skip_constructor = false;
+		this._hx_constructor(id,pos,target,targetPos,leadingComments,trailingComments);
+	}
+	_hx_constructor(id,pos,target,targetPos,leadingComments,trailingComments) {
+		this.args = null;
+		this.targetExpr = null;
+		super._hx_constructor(id,pos,leadingComments,trailingComments);
 		this.target = target;
 		this.targetPos = targetPos;
 	}
 	type() {
 		return "Insertion";
 	}
+	each(handleNode) {
+		super.each(handleNode);
+		if(this.targetExpr != null) {
+			handleNode(this.targetExpr,this);
+			this.targetExpr.each(handleNode);
+		}
+		if(this.args != null) {
+			let _g = 0;
+			let _g1 = this.args;
+			while(_g < _g1.length) {
+				let arg = _g1[_g];
+				++_g;
+				handleNode(arg,this);
+				arg.each(handleNode);
+			}
+		}
+	}
 	toJson() {
 		let json = super.toJson();
-		json.target = this.target;
+		if(this.targetExpr != null) {
+			json.targetExpr = this.targetExpr.toJson();
+		} else {
+			json.target = this.target;
+		}
 		json.targetPos = this.targetPos.toJson();
+		if(this.args != null) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = this.args;
+			while(_g1 < _g2.length) {
+				let arg = _g2[_g1];
+				++_g1;
+				_g.push(arg.toJson());
+			}
+			json.args = _g;
+		}
 		return json;
 	}
 }
@@ -22523,6 +23379,63 @@ loreline_NInsertion.__super__ = loreline_AstNode;
 Object.assign(loreline_NInsertion.prototype, {
 	__class__: loreline_NInsertion
 });
+class loreline_NBeatCall extends loreline_AstNode {
+	constructor(id,pos,targetExpr,targetPos,leadingComments,trailingComments) {
+		loreline_Node._hx_skip_constructor = true;
+		super();
+		loreline_Node._hx_skip_constructor = false;
+		this._hx_constructor(id,pos,targetExpr,targetPos,leadingComments,trailingComments);
+	}
+	_hx_constructor(id,pos,targetExpr,targetPos,leadingComments,trailingComments) {
+		this.args = null;
+		super._hx_constructor(id,pos,leadingComments,trailingComments);
+		this.targetExpr = targetExpr;
+		this.targetPos = targetPos;
+	}
+	type() {
+		return "BeatCall";
+	}
+	each(handleNode) {
+		super.each(handleNode);
+		if(this.targetExpr != null) {
+			handleNode(this.targetExpr,this);
+			this.targetExpr.each(handleNode);
+		}
+		if(this.args != null) {
+			let _g = 0;
+			let _g1 = this.args;
+			while(_g < _g1.length) {
+				let arg = _g1[_g];
+				++_g;
+				handleNode(arg,this);
+				arg.each(handleNode);
+			}
+		}
+	}
+	toJson() {
+		let json = super.toJson();
+		json.targetExpr = this.targetExpr.toJson();
+		json.targetPos = this.targetPos.toJson();
+		if(this.args != null) {
+			let _g = [];
+			let _g1 = 0;
+			let _g2 = this.args;
+			while(_g1 < _g2.length) {
+				let arg = _g2[_g1];
+				++_g1;
+				_g.push(arg.toJson());
+			}
+			json.args = _g;
+		}
+		return json;
+	}
+}
+$hxClasses["loreline.NBeatCall"] = loreline_NBeatCall;
+loreline_NBeatCall.__name__ = "loreline.NBeatCall";
+loreline_NBeatCall.__super__ = loreline_AstNode;
+Object.assign(loreline_NBeatCall.prototype, {
+	__class__: loreline_NBeatCall
+});
 class loreline_NFunctionDecl extends loreline_NExpr {
 	constructor(id,pos,name,args,code,external,leadingComments,trailingComments) {
 		super(id,pos,leadingComments,trailingComments);
@@ -22895,7 +23808,9 @@ Object.assign(loreline_NImportStatement.prototype, {
 });
 class loreline_Objects {
 	static isFields(value) {
-		if(js_Boot.__implements(value,loreline_Fields)) {
+		if(value == null) {
+			return false;
+		} else if(js_Boot.__implements(value,loreline_Fields)) {
 			return true;
 		} else if(((value) instanceof haxe_ds_StringMap)) {
 			return true;
@@ -22996,7 +23911,8 @@ class loreline_Objects {
 			}
 			return instance;
 		}
-		return new haxe_ds_StringMap();
+		let fields = { };
+		return fields;
 	}
 }
 $hxClasses["loreline.Objects"] = loreline_Objects;
@@ -23389,7 +24305,17 @@ class loreline_Parser {
 		case 1:
 			return this.parseStateDecl(false);
 		case 2:
-			return this.parseBeatDecl();
+			if(this.peek().type == loreline_TokenType.LParen) {
+				let node = this.parseBeatCall();
+				if(topLevel) {
+					return _gthis.wrapInRootBeat(node);
+				} else {
+					return node;
+				}
+			} else {
+				return this.parseBeatDecl();
+			}
+			break;
 		case 3:
 			if(topLevel) {
 				return this.parseCharacterDecl();
@@ -23883,6 +24809,34 @@ class loreline_Parser {
 		this.expect(loreline_TokenType.KwBeat);
 		beatNode.pos = startPos.extendedTo(this.currentPos());
 		beatNode.name = this.expectIdentifier();
+		if(this.match(loreline_TokenType.LParen)) {
+			let params = [];
+			if(!this.check(loreline_TokenType.RParen)) {
+				do {
+					while(this.match(loreline_TokenType.LineBreak)) {
+					}
+					let paramPos = this.currentPos();
+					let paramName = this.expectIdentifier();
+					let defaultValue = null;
+					if(this.match(loreline_TokenType.OpAssign)) {
+						defaultValue = this.parseExpression();
+					}
+					let _g = 0;
+					while(_g < params.length) {
+						let existing = params[_g];
+						++_g;
+						if(existing.name == paramName) {
+							this.addError(new loreline_ParseError("Duplicate beat parameter: " + paramName,paramPos));
+						}
+					}
+					params.push(new loreline_NBeatParam(paramName,paramPos,defaultValue));
+					while(this.match(loreline_TokenType.LineBreak)) {
+					}
+				} while(this.match(loreline_TokenType.Comma));
+			}
+			this.expect(loreline_TokenType.RParen);
+			beatNode.params = params;
+		}
 		let blockStart = this.parseBlockStart();
 		let blockEnd = blockStart.type == loreline_TokenType.Indent ? loreline_TokenType.Unindent : loreline_TokenType.RBrace;
 		beatNode.style = blockEnd == loreline_TokenType.RBrace ? 1 : 0;
@@ -24295,14 +25249,72 @@ class loreline_Parser {
 		if(this.match(loreline_TokenType.Dot)) {
 			return this.attachComments(new loreline_NTransition(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),".",this.prevNonWhitespaceOrComment().pos));
 		}
+		if(this.check(loreline_TokenType.KwBeat)) {
+			let targetStart = this.currentPos();
+			this.advance();
+			this.expect(loreline_TokenType.LParen);
+			let callArgs = this.parseCallArguments();
+			if(callArgs.length == 0) {
+				this.addError(new loreline_ParseError("beat() requires a target expression",targetStart));
+			}
+			let node = new loreline_NTransition(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),null,targetStart.extendedTo(this.prevNonWhitespaceOrComment().pos));
+			node.targetExpr = callArgs.length > 0 ? callArgs[0] : null;
+			if(callArgs.length > 1) {
+				node.args = callArgs.slice(1);
+			}
+			return this.attachComments(node);
+		}
 		let target = this.expectIdentifier();
-		return this.attachComments(new loreline_NTransition(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),target,this.prevNonWhitespaceOrComment().pos));
+		let targetPos = this.prevNonWhitespaceOrComment().pos;
+		let args = null;
+		if(this.match(loreline_TokenType.LParen)) {
+			args = this.parseCallArguments();
+		}
+		let node = new loreline_NTransition(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),target,targetPos);
+		node.args = args;
+		return this.attachComments(node);
 	}
 	parseInsertion() {
 		let startPos = this.currentPos();
 		this.expect(loreline_TokenType.OpPlus);
+		if(this.check(loreline_TokenType.KwBeat)) {
+			let targetStart = this.currentPos();
+			this.advance();
+			this.expect(loreline_TokenType.LParen);
+			let callArgs = this.parseCallArguments();
+			if(callArgs.length == 0) {
+				this.addError(new loreline_ParseError("beat() requires a target expression",targetStart));
+			}
+			let node = new loreline_NInsertion(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),null,targetStart.extendedTo(this.prevNonWhitespaceOrComment().pos));
+			node.targetExpr = callArgs.length > 0 ? callArgs[0] : null;
+			if(callArgs.length > 1) {
+				node.args = callArgs.slice(1);
+			}
+			return this.attachComments(node);
+		}
 		let target = this.expectIdentifier();
-		return this.attachComments(new loreline_NInsertion(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),target,this.prevNonWhitespaceOrComment().pos));
+		let targetPos = this.prevNonWhitespaceOrComment().pos;
+		let args = null;
+		if(this.match(loreline_TokenType.LParen)) {
+			args = this.parseCallArguments();
+		}
+		let node = new loreline_NInsertion(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),target,targetPos);
+		node.args = args;
+		return this.attachComments(node);
+	}
+	parseBeatCall() {
+		let startPos = this.currentPos();
+		this.expect(loreline_TokenType.KwBeat);
+		this.expect(loreline_TokenType.LParen);
+		let callArgs = this.parseCallArguments();
+		if(callArgs.length == 0) {
+			this.addError(new loreline_ParseError("beat() requires a target expression",startPos));
+		}
+		let node = new loreline_NBeatCall(this.nextNodeId(4),startPos.extendedTo(this.prevNonWhitespaceOrComment().pos),callArgs.length > 0 ? callArgs[0] : null,startPos.extendedTo(this.prevNonWhitespaceOrComment().pos));
+		if(callArgs.length > 1) {
+			node.args = callArgs.slice(1);
+		}
+		return this.attachComments(node);
 	}
 	parseFunction() {
 		let startPos = this.currentPos();
@@ -25487,6 +26499,9 @@ class loreline_Printer {
 		case loreline_NAssign:
 			this.printAssignment(node);
 			break;
+		case loreline_NBeatCall:
+			this.printBeatCall(node);
+			break;
 		case loreline_NBeatDecl:
 			this.printBeatDecl(node);
 			break;
@@ -25700,7 +26715,29 @@ class loreline_Printer {
 		this.newline();
 		this.newline();
 		this.printLeadingComments(beat);
-		this.write("beat " + beat.name + " ");
+		this.write("beat " + beat.name);
+		if(beat.params != null) {
+			let savedComments = this.enableComments;
+			this.enableComments = false;
+			this.write("(");
+			let _g = 0;
+			let _g1 = beat.params.length;
+			while(_g < _g1) {
+				let i = _g++;
+				if(i > 0) {
+					this.write(", ");
+				}
+				let param = beat.params[i];
+				this.write(param.name);
+				if(param.defaultValue != null) {
+					this.write(" = ");
+					this.printNode(param.defaultValue);
+				}
+			}
+			this.write(")");
+			this.enableComments = savedComments;
+		}
+		this.write(" ");
 		this.printTrailingComments(beat);
 		if(beat.style == 1) {
 			this.write("{");
@@ -26005,7 +27042,18 @@ class loreline_Printer {
 			this.newline();
 		}
 		this.printLeadingComments(trans);
-		this.write("-> " + trans.target);
+		if(trans.targetExpr != null) {
+			this.write("-> beat(");
+			this.printTargetExprAndArgs(trans.targetExpr,trans.args);
+			this.write(")");
+		} else {
+			this.write("-> " + trans.target);
+			if(trans.args != null) {
+				this.write("(");
+				this.printTargetExprAndArgs(null,trans.args);
+				this.write(")");
+			}
+		}
 		this.printTrailingComments(trans);
 	}
 	printInsertion(insert) {
@@ -26013,9 +27061,52 @@ class loreline_Printer {
 			this.newline();
 		}
 		this.printLeadingComments(insert);
-		this.write("+ " + insert.target);
+		if(insert.targetExpr != null) {
+			this.write("+ beat(");
+			this.printTargetExprAndArgs(insert.targetExpr,insert.args);
+			this.write(")");
+		} else {
+			this.write("+ " + insert.target);
+			if(insert.args != null) {
+				this.write("(");
+				this.printTargetExprAndArgs(null,insert.args);
+				this.write(")");
+			}
+		}
 		this.printTrailingComments(insert);
 	}
+	printBeatCall(call) {
+		if(this._prevLevel == this._level) {
+			this.newline();
+		}
+		this.printLeadingComments(call);
+		this.write("beat(");
+		this.printTargetExprAndArgs(call.targetExpr,call.args);
+		this.write(")");
+		this.printTrailingComments(call);
+	}
+	printTargetExprAndArgs(targetExpr,args) {
+		let savedComments = this.enableComments;
+		this.enableComments = false;
+		let first = true;
+		if(targetExpr != null) {
+			this.printNode(targetExpr);
+			first = false;
+		}
+		if(args != null) {
+			let _g = 0;
+			while(_g < args.length) {
+				let arg = args[_g];
+				++_g;
+				if(!first) {
+					this.write(", ");
+				}
+				first = false;
+				this.printNode(arg);
+			}
+		}
+		this.enableComments = savedComments;
+	}
 	printStringLiteral(str) {
 		let surroundWithQuotes = str.quotes == 1;
 		if(surroundWithQuotes) {
@@ -26683,9 +27774,84 @@ class loreline_Utf8 {
 	static uCharAt(str,pos) {
 		return str.charAt(pos);
 	}
+	static toCodes(str) {
+		let len = str.length;
+		let v = new Array(len);
+		let _g = 0;
+		let _g1 = len;
+		while(_g < _g1) {
+			let i = _g++;
+			v[i] = str.charCodeAt(i);
+		}
+		return v;
+	}
 }
 $hxClasses["loreline.Utf8"] = loreline_Utf8;
 loreline_Utf8.__name__ = "loreline.Utf8";
+class loreline_Utf8Vector {
+	static uLength(v) {
+		return v.length;
+	}
+	static uCharCodeAt(v,pos) {
+		if(pos < 0 || pos >= v.length) {
+			return -1;
+		} else {
+			return v[pos];
+		}
+	}
+	static uSubstr(v,pos,len) {
+		return loreline_Utf8Vector.slice(v,pos,len != null ? pos + len : v.length);
+	}
+	static uSubstring(v,startIndex,endIndex) {
+		return loreline_Utf8Vector.slice(v,startIndex,endIndex != null ? endIndex : v.length);
+	}
+	static uCharAt(v,pos) {
+		if(pos < 0 || pos >= v.length) {
+			return "";
+		} else {
+			return loreline_Utf8Vector.slice(v,pos,pos + 1);
+		}
+	}
+	static uIndexOf(v,substr,startIndex) {
+		let needle = loreline_Utf8.toCodes(substr);
+		let nlen = needle.length;
+		if(nlen == 0) {
+			if(startIndex != null) {
+				return startIndex;
+			} else {
+				return 0;
+			}
+		}
+		let i = startIndex != null && startIndex > 0 ? startIndex : 0;
+		let last = v.length - nlen;
+		while(i <= last) {
+			let k = 0;
+			while(k < nlen && v[i + k] == needle[k]) ++k;
+			if(k == nlen) {
+				return i;
+			}
+			++i;
+		}
+		return -1;
+	}
+	static slice(v,start,end) {
+		if(start < 0) {
+			start = 0;
+		}
+		if(end > v.length) {
+			end = v.length;
+		}
+		let buf_b = "";
+		let i = start;
+		while(i < end) {
+			buf_b += String.fromCodePoint(v[i]);
+			++i;
+		}
+		return buf_b;
+	}
+}
+$hxClasses["loreline.Utf8Vector"] = loreline_Utf8Vector;
+loreline_Utf8Vector.__name__ = "loreline.Utf8Vector";
 class loreline_WrappedError extends loreline_Error {
 	constructor(wrapped,message,pos) {
 		super(message,pos);
@@ -30411,9 +31577,9 @@ class loreline_lorscript_Interp {
 			if(Object.prototype.hasOwnProperty.call(this.interpreter.topLevelFunctions.h,id)) {
 				return this.interpreter.topLevelFunctions.h[id];
 			}
-			let beat = this.interpreter.resolveBeatByName(id);
-			if(beat != null) {
-				return beat;
+			let beatRef = this.interpreter.resolveBeatRefByName(id);
+			if(beatRef != null) {
+				return beatRef;
 			}
 			let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.EUnknownVariable(id),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
 			throw haxe_Exception.thrown(e);
@@ -30515,16 +31681,25 @@ class loreline_lorscript_Interp {
 				args.push(this.expr(p));
 			}
 			let _g3 = e7.e;
-			if(_g3._hx_index == 5) {
-				let e = _g3.e;
-				let f = _g3.f;
-				let obj = this.expr(e);
+			switch(_g3._hx_index) {
+			case 1:
+				let id1 = _g3.v;
+				if(id1 == "call" && !this.callIsShadowed()) {
+					return this.dynamicCall(args);
+				} else {
+					return this.call(null,this.expr(e7),args);
+				}
+				break;
+			case 5:
+				let e8 = _g3.e;
+				let f2 = _g3.f;
+				let obj = this.expr(e8);
 				if(obj == null) {
-					let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.EInvalidAccess(f),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
+					let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.EInvalidAccess(f2),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
 					throw haxe_Exception.thrown(e);
 				}
-				return this.fcall(obj,f,args);
-			} else {
+				return this.fcall(obj,f2,args);
+			default:
 				return this.call(null,this.expr(e7),args);
 			}
 			break;
@@ -30542,14 +31717,14 @@ class loreline_lorscript_Interp {
 			break;
 		case 10:
 			let econd1 = e1.cond;
-			let e8 = e1.e;
-			this.whileLoop(econd1,e8);
+			let e9 = e1.e;
+			this.whileLoop(econd1,e9);
 			return null;
 		case 11:
 			let v2 = e1.v;
 			let it = e1.it;
-			let e9 = e1.e;
-			this.forLoop(v2,it,e9);
+			let e10 = e1.e;
+			this.forLoop(v2,it,e10);
 			return null;
 		case 12:
 			throw haxe_Exception.thrown(loreline_lorscript__$Interp_Stop.SBreak);
@@ -30574,7 +31749,7 @@ class loreline_lorscript_Interp {
 					minParams += 1;
 				}
 			}
-			let f2 = function(args) {
+			let f3 = function(args) {
 				if((args == null ? 0 : args.length) != params1.length) {
 					if(args.length < minParams) {
 						let str = "Invalid number of parameters. Got " + args.length + ", required " + minParams;
@@ -30634,26 +31809,26 @@ class loreline_lorscript_Interp {
 				me.depth = depth;
 				return r;
 			};
-			let f3 = Reflect.makeVarArgs(f2);
+			let f4 = Reflect.makeVarArgs(f3);
 			if(name != null) {
 				if(this.depth == 0) {
-					this.variables.h[name] = f3;
+					this.variables.h[name] = f4;
 				} else {
 					this.declared.push({ n : name, old : this.locals.h[name]});
-					let ref = { r : f3};
+					let ref = { r : f4};
 					this.locals.h[name] = ref;
 					capturedLocals.h[name] = ref;
 				}
 			}
-			return f3;
+			return f4;
 		case 15:
-			let e10 = e1.e;
-			this.returnValue = e10 == null ? null : this.expr(e10);
+			let e13 = e1.e;
+			this.returnValue = e13 == null ? null : this.expr(e13);
 			throw haxe_Exception.thrown(loreline_lorscript__$Interp_Stop.SReturn);
 		case 16:
-			let e13 = e1.e;
+			let e14 = e1.e;
 			let index = e1.index;
-			let arr = this.expr(e13);
+			let arr = this.expr(e14);
 			let index1 = this.expr(index);
 			if(loreline_Arrays.isArray(arr)) {
 				return loreline_Arrays.arrayGet(arr,index1);
@@ -30727,18 +31902,18 @@ class loreline_lorscript_Interp {
 			}
 			return this.cnew(cl,a);
 		case 19:
-			let e14 = e1.e;
-			throw haxe_Exception.thrown(this.expr(e14));
+			let e15 = e1.e;
+			throw haxe_Exception.thrown(this.expr(e15));
 		case 20:
 			let _g7 = e1.t;
-			let e15 = e1.e;
+			let e16 = e1.e;
 			let n1 = e1.v;
 			let ecatch = e1.ecatch;
 			let old1 = this.declared.length;
 			let oldTry = this.inTry;
 			try {
 				this.inTry = true;
-				let v = this.expr(e15);
+				let v = this.expr(e16);
 				this.restore(old1);
 				this.inTry = oldTry;
 				return v;
@@ -30772,19 +31947,19 @@ class loreline_lorscript_Interp {
 			return o;
 		case 22:
 			let econd2 = e1.cond;
-			let e16 = e1.e1;
+			let e17 = e1.e1;
 			let e23 = e1.e2;
 			if(this.expr(econd2) == true) {
-				return this.expr(e16);
+				return this.expr(e17);
 			} else {
 				return this.expr(e23);
 			}
 			break;
 		case 23:
-			let e17 = e1.e;
+			let e18 = e1.e;
 			let cases = e1.cases;
 			let def = e1.defaultExpr;
-			let val = this.expr(e17);
+			let val = this.expr(e18);
 			let match = false;
 			let _g9 = 0;
 			while(_g9 < cases.length) {
@@ -30811,18 +31986,18 @@ class loreline_lorscript_Interp {
 			return val;
 		case 24:
 			let econd3 = e1.cond;
-			let e18 = e1.e;
-			this.doWhileLoop(econd3,e18);
+			let e19 = e1.e;
+			this.doWhileLoop(econd3,e19);
 			return null;
 		case 25:
 			let _g10 = e1.name;
 			let _g11 = e1.args;
-			let e19 = e1.e;
-			return this.expr(e19);
-		case 26:
-			let _g12 = e1.t;
 			let e20 = e1.e;
 			return this.expr(e20);
+		case 26:
+			let _g12 = e1.t;
+			let e24 = e1.e;
+			return this.expr(e24);
 		}
 	}
 	doWhileLoop(econd,e) {
@@ -31061,17 +32236,18 @@ class loreline_lorscript_Interp {
 	}
 	fcall(o,f,args) {
 		let helper = null;
+		let oBeat = loreline_RuntimeBeatRef.beatOf(o);
 		if(typeof(o) == "string") {
 			helper = loreline_Objects.getStringHelper(this.interpreter,f);
 		} else if(loreline_Arrays.isArray(o)) {
 			helper = loreline_Objects.getArrayHelper(this.interpreter,f);
-		} else if(((o) instanceof loreline_NBeatDecl)) {
+		} else if(oBeat != null) {
 			helper = loreline_Objects.getBeatHelper(this.interpreter,f);
 		} else if(loreline_Objects.isFields(o)) {
 			helper = loreline_Objects.getMapHelper(this.interpreter,f);
 		}
 		if(helper != null && Reflect.isFunction(helper)) {
-			args.splice(0,0,o);
+			args.splice(0,0,oBeat != null ? oBeat : o);
 			return this.call(null,helper,args);
 		}
 		return this.call(o,this.get(o,f),args);
@@ -31079,6 +32255,57 @@ class loreline_lorscript_Interp {
 	call(o,f,args) {
 		return f.apply(o,args);
 	}
+	callIsShadowed() {
+		if(Object.prototype.hasOwnProperty.call(this.locals.h,"call")) {
+			return true;
+		}
+		if(Object.prototype.hasOwnProperty.call(this.variables.h,"call")) {
+			return true;
+		}
+		if(loreline_Objects.fieldExists(this.interpreter,this.interpreter.topLevelState.fields,"call")) {
+			return true;
+		}
+		if(Object.prototype.hasOwnProperty.call(this.interpreter.topLevelCharacters.h,"call")) {
+			return true;
+		}
+		if(Object.prototype.hasOwnProperty.call(this.interpreter.topLevelFunctions.h,"call")) {
+			return true;
+		}
+		if(this.interpreter.resolveBeatByName("call") != null) {
+			return true;
+		}
+		return false;
+	}
+	dynamicCall(args) {
+		if(args.length == 0) {
+			let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.ECustom("call() requires a target argument"),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
+			throw haxe_Exception.thrown(e);
+		}
+		let target = args[0];
+		let rest = args.slice(1);
+		if(loreline_RuntimeBeatRef.beatOf(target) != null) {
+			let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.ECustom("call() can only call functions. Beats cannot run inside function code."),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
+			throw haxe_Exception.thrown(e);
+		}
+		if(typeof(target) == "string") {
+			let name = target;
+			if(this.interpreter.resolveBeatByName(name) != null) {
+				let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.ECustom("call() can only call functions. Beats cannot run inside function code."),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
+				throw haxe_Exception.thrown(e);
+			}
+			if(Object.prototype.hasOwnProperty.call(this.interpreter.topLevelFunctions.h,name)) {
+				target = this.interpreter.topLevelFunctions.h[name];
+			} else {
+				let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.ECustom("call() target not found: " + name),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
+				throw haxe_Exception.thrown(e);
+			}
+		}
+		if(!Reflect.isFunction(target)) {
+			let e = new loreline_lorscript_Error(loreline_lorscript_ErrorDef.ECustom("call() target is not a function"),this.curExpr.pmin,this.curExpr.pmax,this.curExpr.origin,this.curExpr.line);
+			throw haxe_Exception.thrown(e);
+		}
+		return this.call(null,target,rest);
+	}
 	cnew(cl,args) {
 		let c = $hxClasses[cl];
 		if(c == null) {
@@ -35797,15 +37024,16 @@ class loreline_translation_CsvTranslation {
 		let field = new StringBuf();
 		let inQuotes = false;
 		let i = 0;
-		let len = content.length;
+		let chars = content;
+		let len = chars.length;
 		while(i < len) {
-			let c = HxOverrides.cca(content,i);
+			let c = HxOverrides.cca(chars,i);
 			let c1 = c == null ? -1 : c;
 			if(inQuotes) {
 				if(c1 == 34) {
 					let tmp;
 					if(i + 1 < len) {
-						let c = HxOverrides.cca(content,i + 1);
+						let c = HxOverrides.cca(chars,i + 1);
 						tmp = (c == null ? -1 : c) == 34;
 					} else {
 						tmp = false;
@@ -35837,7 +37065,7 @@ class loreline_translation_CsvTranslation {
 				row = [];
 				let tmp;
 				if(c1 == 13 && i + 1 < len) {
-					let c = HxOverrides.cca(content,i + 1);
+					let c = HxOverrides.cca(chars,i + 1);
 					tmp = (c == null ? -1 : c) == 10;
 				} else {
 					tmp = false;
@@ -36359,18 +37587,14 @@ class loreline_translation_XliffTranslation {
 		let _g_array = root.children;
 		while(_g_current < _g_array.length) {
 			let child = _g_array[_g_current++];
-			let tmp;
 			if(child.nodeType == 0) {
 				if(child.nodeType != Xml.Element) {
 					throw haxe_Exception.thrown("Bad node type, expected Element but found " + (child.nodeType == null ? "null" : XmlType.toString(child.nodeType)));
 				}
-				tmp = child.nodeName == "xliff";
-			} else {
-				tmp = false;
-			}
-			if(tmp) {
-				xliff = child;
-				break;
+				if(child.nodeName == "xliff") {
+					xliff = child;
+					break;
+				}
 			}
 		}
 		if(xliff == null) {
@@ -36497,17 +37721,13 @@ class loreline_translation_XliffTranslation {
 		let _g_array = parent.children;
 		while(_g_current < _g_array.length) {
 			let c = _g_array[_g_current++];
-			let tmp;
 			if(c.nodeType == 0) {
 				if(c.nodeType != Xml.Element) {
 					throw haxe_Exception.thrown("Bad node type, expected Element but found " + (c.nodeType == null ? "null" : XmlType.toString(c.nodeType)));
 				}
-				tmp = c.nodeName == name;
-			} else {
-				tmp = false;
-			}
-			if(tmp) {
-				return c;
+				if(c.nodeName == name) {
+					return c;
+				}
 			}
 		}
 		return null;