正在新增编译缓存功能,用于加速与加密
This commit is contained in:
@@ -5,6 +5,11 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class BackpointRunner : JumpRuntimePointerRunner
|
public class BackpointRunner : JumpRuntimePointerRunner
|
||||||
{
|
{
|
||||||
|
public override void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public override object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public override object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -5,6 +5,11 @@ namespace Convention.RScript
|
|||||||
{
|
{
|
||||||
public class BreakpointRunner : IRSentenceRunner
|
public class BreakpointRunner : IRSentenceRunner
|
||||||
{
|
{
|
||||||
|
public void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
parser.Compile<bool>(sentence.content);
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
@@ -18,7 +23,6 @@ namespace Convention.RScript
|
|||||||
else if (context.NamespaceLayer.TryGetValue(context.RuntimePointerStack.Peek(), out var exitPointer))
|
else if (context.NamespaceLayer.TryGetValue(context.RuntimePointerStack.Peek(), out var exitPointer))
|
||||||
{
|
{
|
||||||
context.CurrentRuntimePointer = exitPointer;
|
context.CurrentRuntimePointer = exitPointer;
|
||||||
//DoExitNamespace(parser);
|
|
||||||
context.SentenceRunners[RScriptSentence.Mode.ExitNamespace].Run(parser, context.CurrentSentence, context);
|
context.SentenceRunners[RScriptSentence.Mode.ExitNamespace].Run(parser, context.CurrentSentence, context);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@@ -6,6 +6,66 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class DefineVariableRunner : IRSentenceRunner
|
public class DefineVariableRunner : IRSentenceRunner
|
||||||
{
|
{
|
||||||
|
public void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
var varTypeName = sentence.info[0];
|
||||||
|
var varName = sentence.info[1];
|
||||||
|
var varInitExpression = sentence.info[2];
|
||||||
|
Type varType;
|
||||||
|
object varDefaultValue;
|
||||||
|
{
|
||||||
|
if (varTypeName == "string")
|
||||||
|
{
|
||||||
|
varType = typeof(string);
|
||||||
|
varDefaultValue = "";
|
||||||
|
}
|
||||||
|
else if (varTypeName == "int")
|
||||||
|
{
|
||||||
|
varType = typeof(int);
|
||||||
|
if (varInitExpression != null) parser.Compile<int>(varInitExpression);
|
||||||
|
varDefaultValue = 0;
|
||||||
|
}
|
||||||
|
else if (varTypeName == "double")
|
||||||
|
{
|
||||||
|
varType = typeof(double);
|
||||||
|
if (varInitExpression != null) parser.Compile<double>(varInitExpression);
|
||||||
|
varDefaultValue = 0.0;
|
||||||
|
}
|
||||||
|
else if (varTypeName == "float")
|
||||||
|
{
|
||||||
|
varType = typeof(float);
|
||||||
|
if (varInitExpression != null) parser.Compile<float>(varInitExpression);
|
||||||
|
varDefaultValue = 0.0f;
|
||||||
|
}
|
||||||
|
else if (varTypeName == "bool")
|
||||||
|
{
|
||||||
|
varType = typeof(bool);
|
||||||
|
if (varInitExpression != null) parser.Compile<bool>(varInitExpression);
|
||||||
|
varDefaultValue = false;
|
||||||
|
}
|
||||||
|
else if (varTypeName == "var")
|
||||||
|
{
|
||||||
|
varType = typeof(object);
|
||||||
|
if (varInitExpression != null) parser.Compile(varInitExpression);
|
||||||
|
varDefaultValue = new object();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new RScriptRuntimeException($"Unsupported variable type '{varTypeName}'.", context.CurrentRuntimePointer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (context.CurrentLocalSpaceVariableNames.Peek().Contains(varName) == false)
|
||||||
|
{
|
||||||
|
context.Variables.Add(varName, new(varType, default));
|
||||||
|
parser.context.Variables[varName] = varDefaultValue;
|
||||||
|
context.CurrentLocalSpaceVariableNames.Peek().Add(varName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new RScriptRuntimeException($"Variable '{varName}' already defined on this namespace.", context.CurrentRuntimePointer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -5,6 +5,11 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class EnterNamedSpaceRunner : IRSentenceRunner
|
public class EnterNamedSpaceRunner : IRSentenceRunner
|
||||||
{
|
{
|
||||||
|
public void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -5,6 +5,11 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class EnterNamespaceRunner : IRSentenceRunner
|
public class EnterNamespaceRunner : IRSentenceRunner
|
||||||
{
|
{
|
||||||
|
public void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -5,6 +5,11 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class ExitNamespaceRunner : IRSentenceRunner
|
public class ExitNamespaceRunner : IRSentenceRunner
|
||||||
{
|
{
|
||||||
|
public void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -5,6 +5,11 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class ExpressionRunner : IRSentenceRunner
|
public class ExpressionRunner : IRSentenceRunner
|
||||||
{
|
{
|
||||||
|
public void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
parser.Compile(sentence.content);
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -5,6 +5,11 @@ namespace Convention.RScript.Runner
|
|||||||
{
|
{
|
||||||
public class GoToRunner : JumpRuntimePointerRunner
|
public class GoToRunner : JumpRuntimePointerRunner
|
||||||
{
|
{
|
||||||
|
public override void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
|
{
|
||||||
|
parser.Compile<bool>(sentence.info[0]);
|
||||||
|
}
|
||||||
|
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public override object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
public override object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context)
|
||||||
{
|
{
|
||||||
|
@@ -59,6 +59,7 @@ namespace Convention.RScript.Runner
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public abstract void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context);
|
||||||
[return: MaybeNull]
|
[return: MaybeNull]
|
||||||
public abstract object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context);
|
public abstract object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context);
|
||||||
}
|
}
|
||||||
|
@@ -14,7 +14,7 @@ namespace Convention.RScript.Matcher
|
|||||||
if (DefineVariableMatch.Success)
|
if (DefineVariableMatch.Success)
|
||||||
{
|
{
|
||||||
sentence.mode = RScriptSentence.Mode.DefineVariable;
|
sentence.mode = RScriptSentence.Mode.DefineVariable;
|
||||||
sentence.info = new() { DefineVariableMatch.Groups[1].Value, DefineVariableMatch.Groups[2].Value, DefineVariableMatch.Groups[3].Value };
|
sentence.info = new[] { DefineVariableMatch.Groups[1].Value, DefineVariableMatch.Groups[2].Value, DefineVariableMatch.Groups[3].Value };
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@ namespace Convention.RScript.Matcher
|
|||||||
if (DeclareVariableMatch.Success)
|
if (DeclareVariableMatch.Success)
|
||||||
{
|
{
|
||||||
sentence.mode = RScriptSentence.Mode.DefineVariable;
|
sentence.mode = RScriptSentence.Mode.DefineVariable;
|
||||||
sentence.info = new() { DeclareVariableMatch.Groups[1].Value, DeclareVariableMatch.Groups[2].Value, null };
|
sentence.info = new[] { DeclareVariableMatch.Groups[1].Value, DeclareVariableMatch.Groups[2].Value, null };
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -13,7 +13,7 @@ namespace Convention.RScript.Matcher
|
|||||||
{
|
{
|
||||||
sentence.mode = RScriptSentence.Mode.Goto;
|
sentence.mode = RScriptSentence.Mode.Goto;
|
||||||
sentence.content = GotoMatch.Groups[2].Value;
|
sentence.content = GotoMatch.Groups[2].Value;
|
||||||
sentence.info = new() { GotoMatch.Groups[1].Value, GotoMatch.Groups[2].Value };
|
sentence.info = new[] { GotoMatch.Groups[1].Value, GotoMatch.Groups[2].Value };
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
using Flee.PublicTypes;
|
using Flee.PublicTypes;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace Convention.RScript
|
namespace Convention.RScript
|
||||||
{
|
{
|
||||||
@@ -95,6 +97,7 @@ namespace Convention.RScript.Parser
|
|||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private readonly Dictionary<string, Type> CompileGenericExpressionTypen = new();
|
||||||
private readonly Dictionary<string, IExpression> CompileGenericExpression = new();
|
private readonly Dictionary<string, IExpression> CompileGenericExpression = new();
|
||||||
private readonly Dictionary<string, IDynamicExpression> CompileDynamicExpression = new();
|
private readonly Dictionary<string, IDynamicExpression> CompileDynamicExpression = new();
|
||||||
|
|
||||||
@@ -110,9 +113,7 @@ namespace Convention.RScript.Parser
|
|||||||
{
|
{
|
||||||
return (result as IGenericExpression<T>).Evaluate();
|
return (result as IGenericExpression<T>).Evaluate();
|
||||||
}
|
}
|
||||||
var compile = context.CompileGeneric<T>(expression);
|
return Compile<T>(expression).Evaluate();
|
||||||
CompileGenericExpression[expression] = compile;
|
|
||||||
return compile.Evaluate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public object Evaluate(string expression)
|
public object Evaluate(string expression)
|
||||||
@@ -121,9 +122,77 @@ namespace Convention.RScript.Parser
|
|||||||
{
|
{
|
||||||
return result.Evaluate();
|
return result.Evaluate();
|
||||||
}
|
}
|
||||||
|
return Compile(expression).Evaluate();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IGenericExpression<T> Compile<T>(string expression)
|
||||||
|
{
|
||||||
|
var compile = context.CompileGeneric<T>(expression);
|
||||||
|
CompileGenericExpression[expression] = compile;
|
||||||
|
CompileGenericExpressionTypen[expression] = typeof(T);
|
||||||
|
return compile;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IDynamicExpression Compile(string expression)
|
||||||
|
{
|
||||||
var compile = context.CompileDynamic(expression);
|
var compile = context.CompileDynamic(expression);
|
||||||
CompileDynamicExpression[expression] = compile;
|
CompileDynamicExpression[expression] = compile;
|
||||||
return compile.Evaluate();
|
return compile;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
public struct SerializableParser
|
||||||
|
{
|
||||||
|
public Tuple<string, string>[] CompileGenericExpression;
|
||||||
|
public string[] CompileDynamicExpression;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SerializableParser Serialize()
|
||||||
|
{
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
CompileGenericExpression = (from key in CompileGenericExpression.Keys select Tuple.Create(CompileGenericExpressionTypen[key].Name, key)).ToArray(),
|
||||||
|
CompileDynamicExpression = CompileDynamicExpression.Keys.ToArray()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Deserialize(SerializableParser data)
|
||||||
|
{
|
||||||
|
foreach (var (type, expr) in data.CompileGenericExpression)
|
||||||
|
{
|
||||||
|
if (type == nameof(String))
|
||||||
|
{
|
||||||
|
this.Compile<string>(expr);
|
||||||
|
}
|
||||||
|
else if (type == nameof(Single))
|
||||||
|
{
|
||||||
|
this.Compile<float>(expr);
|
||||||
|
}
|
||||||
|
else if (type == nameof(Double))
|
||||||
|
{
|
||||||
|
this.Compile<double>(expr);
|
||||||
|
}
|
||||||
|
else if (type == nameof(Int32))
|
||||||
|
{
|
||||||
|
this.Compile<int>(expr);
|
||||||
|
}
|
||||||
|
else if (type == nameof(Boolean))
|
||||||
|
{
|
||||||
|
this.Compile<bool>(expr);
|
||||||
|
}
|
||||||
|
else if (type == nameof(Object))
|
||||||
|
{
|
||||||
|
this.Compile<object>(expr);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new NotSupportedException($"Unsupported expression type: {type}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach (var expr in data.CompileDynamicExpression)
|
||||||
|
{
|
||||||
|
this.Compile(expr);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -25,7 +25,14 @@ namespace Convention.RScript
|
|||||||
internalData = value;
|
internalData = value;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (type == typeof(object) || type == value.GetType())
|
if (value == null)
|
||||||
|
{
|
||||||
|
if (type.IsClass)
|
||||||
|
internalData = null;
|
||||||
|
else
|
||||||
|
internalData = Activator.CreateInstance(type);
|
||||||
|
}
|
||||||
|
else if (type == typeof(object) || type == value.GetType())
|
||||||
internalData = value;
|
internalData = value;
|
||||||
else
|
else
|
||||||
internalData = Convert.ChangeType(value, type);
|
internalData = Convert.ChangeType(value, type);
|
||||||
|
@@ -6,11 +6,14 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using static Convention.RScript.RScriptContext;
|
||||||
|
|
||||||
namespace Convention.RScript
|
namespace Convention.RScript
|
||||||
{
|
{
|
||||||
|
[Serializable]
|
||||||
public struct RScriptSentence
|
public struct RScriptSentence
|
||||||
{
|
{
|
||||||
|
[Serializable]
|
||||||
public enum Mode
|
public enum Mode
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -57,12 +60,12 @@ namespace Convention.RScript
|
|||||||
}
|
}
|
||||||
|
|
||||||
public string content;
|
public string content;
|
||||||
public List<string> info;
|
public string[] info;
|
||||||
public Mode mode;
|
public Mode mode;
|
||||||
|
|
||||||
public override string ToString()
|
public override readonly string ToString()
|
||||||
{
|
{
|
||||||
return $"{mode.ToString()}/: {content}";
|
return $"{mode}: {content}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,17 +77,42 @@ namespace Convention.RScript
|
|||||||
public interface IRSentenceRunner
|
public interface IRSentenceRunner
|
||||||
{
|
{
|
||||||
[return: MaybeNull] object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context);
|
[return: MaybeNull] object Run(ExpressionParser parser, RScriptSentence sentence, RScriptContext context);
|
||||||
|
void Compile(ExpressionParser parser, RScriptSentence sentence, RScriptContext context);
|
||||||
}
|
}
|
||||||
|
|
||||||
public partial class RScriptContext
|
public interface IBasicRScriptContext
|
||||||
{
|
{
|
||||||
public readonly RScriptImportClass Import;
|
RScriptImportClass Import { get; }
|
||||||
public readonly RScriptVariables Variables;
|
RScriptVariables Variables { get; }
|
||||||
internal readonly RScriptSentence[] Sentences;
|
RScriptSentence[] Sentences { get; }
|
||||||
|
int CurrentRuntimePointer { get; }
|
||||||
|
RScriptSentence CurrentSentence { get; }
|
||||||
|
|
||||||
|
Dictionary<string, RScriptVariableEntry> GetCurrentVariables();
|
||||||
|
void Run(ExpressionParser parser);
|
||||||
|
IEnumerator RunAsync(ExpressionParser parser);
|
||||||
|
SerializableClass Compile(ExpressionParser parser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public partial class RScriptContext : IBasicRScriptContext
|
||||||
|
{
|
||||||
|
public RScriptImportClass Import { get;private set; }
|
||||||
|
public RScriptVariables Variables { get;private set; }
|
||||||
|
public RScriptSentence[] Sentences { get; private set; }
|
||||||
internal readonly Dictionary<string, int> Labels = new();
|
internal readonly Dictionary<string, int> Labels = new();
|
||||||
internal readonly Dictionary<int, int> NamespaceLayer = new();
|
internal readonly Dictionary<int, int> NamespaceLayer = new();
|
||||||
internal readonly Dictionary<string, int> NamespaceLabels = new();
|
internal readonly Dictionary<string, int> NamespaceLabels = new();
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
public struct SerializableClass
|
||||||
|
{
|
||||||
|
public RScriptSentence[] Sentences;
|
||||||
|
public Tuple<string, int>[] Labels;
|
||||||
|
public Tuple<int, int>[] NamespaceLayer;
|
||||||
|
public Tuple<string, int>[] NamespaceLabels;
|
||||||
|
public ExpressionParser.SerializableParser CompileParser;
|
||||||
|
}
|
||||||
|
|
||||||
public List<IRSentenceMatcher> SentenceParser = new()
|
public List<IRSentenceMatcher> SentenceParser = new()
|
||||||
{
|
{
|
||||||
new NamespaceMater(),
|
new NamespaceMater(),
|
||||||
@@ -211,11 +239,29 @@ namespace Convention.RScript
|
|||||||
BuildUpLabelsAndNamespace();
|
BuildUpLabelsAndNamespace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RScriptContext(SerializableClass data,
|
||||||
|
RScriptImportClass import = null,
|
||||||
|
RScriptVariables variables = null,
|
||||||
|
List<IRSentenceMatcher> matcher = null,
|
||||||
|
Dictionary<RScriptSentence.Mode, IRSentenceRunner> sentenceRunners = null)
|
||||||
|
{
|
||||||
|
this.Import = import ?? new();
|
||||||
|
this.Variables = variables ?? new();
|
||||||
|
this.Variables.Add("context", new(typeof(object), new BuildInContext(this)));
|
||||||
|
|
||||||
|
this.Sentences = data.Sentences;
|
||||||
|
this.Labels = (from item in data.Labels select item).ToDictionary(t => t.Item1, t => t.Item2);
|
||||||
|
this.NamespaceLayer = (from item in data.NamespaceLayer select item).ToDictionary(t => t.Item1, t => t.Item2);
|
||||||
|
this.NamespaceLabels = (from item in data.NamespaceLabels select item).ToDictionary(t => t.Item1, t => t.Item2);
|
||||||
|
}
|
||||||
|
|
||||||
public RScriptSentence CurrentSentence => Sentences[CurrentRuntimePointer];
|
public RScriptSentence CurrentSentence => Sentences[CurrentRuntimePointer];
|
||||||
|
|
||||||
|
public int StepCount { get; private set; }
|
||||||
|
|
||||||
internal object RunNextStep(ExpressionParser parser)
|
internal object RunNextStep(ExpressionParser parser)
|
||||||
{
|
{
|
||||||
|
StepCount++;
|
||||||
var sentence = CurrentSentence;
|
var sentence = CurrentSentence;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -248,6 +294,7 @@ namespace Convention.RScript
|
|||||||
|
|
||||||
private void BeforeRun(ExpressionParser parser)
|
private void BeforeRun(ExpressionParser parser)
|
||||||
{
|
{
|
||||||
|
StepCount = 0;
|
||||||
CurrentLocalSpaceVariableNames.Clear();
|
CurrentLocalSpaceVariableNames.Clear();
|
||||||
RuntimePointerStack.Clear();
|
RuntimePointerStack.Clear();
|
||||||
GotoPointerStack.Clear();
|
GotoPointerStack.Clear();
|
||||||
@@ -257,12 +304,21 @@ namespace Convention.RScript
|
|||||||
{
|
{
|
||||||
parser.context.Imports.AddType(staticType);
|
parser.context.Imports.AddType(staticType);
|
||||||
}
|
}
|
||||||
foreach (var (name,varObject) in Variables)
|
foreach (var (name, varObject) in Variables)
|
||||||
{
|
{
|
||||||
parser.context.Variables[name] = varObject.data;
|
parser.context.Variables[name] = varObject.data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void AfterRun(ExpressionParser parser)
|
||||||
|
{
|
||||||
|
foreach (var (varName, varValue) in parser.context.Variables)
|
||||||
|
{
|
||||||
|
if (Variables.ContainsKey(varName))
|
||||||
|
Variables.SetValue(varName, varValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Run(ExpressionParser parser)
|
public void Run(ExpressionParser parser)
|
||||||
{
|
{
|
||||||
BeforeRun(parser);
|
BeforeRun(parser);
|
||||||
@@ -270,12 +326,7 @@ namespace Convention.RScript
|
|||||||
{
|
{
|
||||||
RunNextStep(parser);
|
RunNextStep(parser);
|
||||||
}
|
}
|
||||||
// 更新上下文变量
|
AfterRun(parser);
|
||||||
foreach (var (varName, varValue) in parser.context.Variables)
|
|
||||||
{
|
|
||||||
if (Variables.ContainsKey(varName))
|
|
||||||
Variables.SetValue(varName, varValue);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerator RunAsync(ExpressionParser parser)
|
public IEnumerator RunAsync(ExpressionParser parser)
|
||||||
@@ -290,12 +341,25 @@ namespace Convention.RScript
|
|||||||
}
|
}
|
||||||
yield return null;
|
yield return null;
|
||||||
}
|
}
|
||||||
// 更新上下文变量
|
AfterRun(parser);
|
||||||
foreach (var (varName, varValue) in parser.context.Variables)
|
}
|
||||||
|
|
||||||
|
public SerializableClass Compile(ExpressionParser parser)
|
||||||
|
{
|
||||||
|
BeforeRun(parser);
|
||||||
|
foreach (var item in Sentences)
|
||||||
{
|
{
|
||||||
if (Variables.ContainsKey(varName))
|
if (SentenceRunners.TryGetValue(item.mode, out var runner))
|
||||||
Variables.SetValue(varName, varValue);
|
runner.Compile(parser, item, this);
|
||||||
}
|
}
|
||||||
|
return new SerializableClass()
|
||||||
|
{
|
||||||
|
CompileParser = parser.Serialize(),
|
||||||
|
Labels = (from item in Labels select Tuple.Create(item.Key, item.Value)).ToArray(),
|
||||||
|
NamespaceLayer = (from item in NamespaceLayer select Tuple.Create(item.Key, item.Value)).ToArray(),
|
||||||
|
NamespaceLabels = (from item in NamespaceLabels select Tuple.Create(item.Key, item.Value)).ToArray(),
|
||||||
|
Sentences = Sentences,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -6,13 +6,25 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using static Convention.RScript.RScriptContext;
|
||||||
|
|
||||||
namespace Convention.RScript
|
namespace Convention.RScript
|
||||||
{
|
{
|
||||||
public class RScriptEngine
|
public interface IRScriptEngine
|
||||||
|
{
|
||||||
|
IBasicRScriptContext context { get; }
|
||||||
|
|
||||||
|
Dictionary<string, RScriptVariableEntry> Run(string script, RScriptImportClass import = null, RScriptVariables variables = null);
|
||||||
|
IEnumerator RunAsync(string script, RScriptImportClass import = null, RScriptVariables variables = null);
|
||||||
|
SerializableClass Compile(string script, RScriptImportClass import = null, RScriptVariables variables = null);
|
||||||
|
Dictionary<string, RScriptVariableEntry> Run(SerializableClass data, RScriptImportClass import = null, RScriptVariables variables = null);
|
||||||
|
IEnumerator RunAsync(SerializableClass data, RScriptImportClass import = null, RScriptVariables variables = null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class RScriptEngine : IRScriptEngine
|
||||||
{
|
{
|
||||||
private ExpressionParser parser;
|
private ExpressionParser parser;
|
||||||
private RScriptContext context;
|
public IBasicRScriptContext context { get; private set; }
|
||||||
|
|
||||||
private IEnumerable<string> SplitScript(string script)
|
private IEnumerable<string> SplitScript(string script)
|
||||||
{
|
{
|
||||||
@@ -122,10 +134,18 @@ namespace Convention.RScript
|
|||||||
return statements.Where(s => !string.IsNullOrWhiteSpace(s));
|
return statements.Where(s => !string.IsNullOrWhiteSpace(s));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IBasicRScriptContext CreateContext(string[] statements, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
|
{
|
||||||
|
return new RScriptContext(statements, import, variables);
|
||||||
|
}
|
||||||
|
private IBasicRScriptContext CreateContext(SerializableClass data, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
|
{
|
||||||
|
return new RScriptContext(data, import, variables);
|
||||||
|
}
|
||||||
public Dictionary<string, RScriptVariableEntry> Run(string script, RScriptImportClass import = null, RScriptVariables variables = null)
|
public Dictionary<string, RScriptVariableEntry> Run(string script, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
{
|
{
|
||||||
parser = new(new());
|
parser = new(new());
|
||||||
context = new(SplitScript(script).ToArray(), import, variables);
|
context = CreateContext(SplitScript(script).ToArray(), import, variables);
|
||||||
context.Run(parser);
|
context.Run(parser);
|
||||||
return context.GetCurrentVariables();
|
return context.GetCurrentVariables();
|
||||||
}
|
}
|
||||||
@@ -133,7 +153,31 @@ namespace Convention.RScript
|
|||||||
public IEnumerator RunAsync(string script, RScriptImportClass import = null, RScriptVariables variables = null)
|
public IEnumerator RunAsync(string script, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
{
|
{
|
||||||
parser = new(new());
|
parser = new(new());
|
||||||
context = new(SplitScript(script).ToArray(), import, variables);
|
context = CreateContext(SplitScript(script).ToArray(), import, variables);
|
||||||
|
return context.RunAsync(parser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SerializableClass Compile(string script, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
|
{
|
||||||
|
parser = new(new());
|
||||||
|
context = CreateContext(SplitScript(script).ToArray(), import, variables);
|
||||||
|
return context.Compile(parser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Dictionary<string, RScriptVariableEntry> Run(SerializableClass data, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
|
{
|
||||||
|
parser = new(new());
|
||||||
|
//parser.Deserialize(data.CompileParser);
|
||||||
|
context = CreateContext(data, import, variables);
|
||||||
|
context.Run(parser);
|
||||||
|
return context.GetCurrentVariables();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerator RunAsync(SerializableClass data, RScriptImportClass import = null, RScriptVariables variables = null)
|
||||||
|
{
|
||||||
|
parser = new(new());
|
||||||
|
//parser.Deserialize(data.CompileParser);
|
||||||
|
context = CreateContext(data, import, variables);
|
||||||
return context.RunAsync(parser);
|
return context.RunAsync(parser);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user