ninemine/RScript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.删除表达式预编译(类型不稳定)2.修复空脚本缓存读取的错误

Browse Source
This commit is contained in:
LiuBai095
2025-12-03 14:36:36 +08:00
parent f9446fb0bb
commit 02906f836d
2 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
RScriptContext.cs
View File

@@ -111,7 +111,7 @@ namespace Convention.RScript
public Tuple<string, int>[] Labels; public Tuple<string, int>[] Labels;
public Tuple<int, int>[] NamespaceLayer; public Tuple<int, int>[] NamespaceLayer;
public Tuple<string, int>[] NamespaceLabels; public Tuple<string, int>[] NamespaceLabels;
public ExpressionParser.SerializableParser CompileParser; //public ExpressionParser.SerializableParser CompileParser;
public Tuple<Tuple<int, int>, Tuple<int, int>>[] JumpPointerCache; public Tuple<Tuple<int, int>, Tuple<int, int>>[] JumpPointerCache;
} }
@@ -364,14 +364,14 @@ namespace Convention.RScript
public SerializableClass Compile(ExpressionParser parser) public SerializableClass Compile(ExpressionParser parser)
{ {
BeforeRun(parser); BeforeRun(parser);
foreach (var item in Sentences) //foreach (var item in Sentences)
{ //{
if (SentenceRunners.TryGetValue(item.mode, out var runner)) // if (SentenceRunners.TryGetValue(item.mode, out var runner))
runner.Compile(parser, item, this); // runner.Compile(parser, item, this);
} //}
return new SerializableClass() return new SerializableClass()
{ {
CompileParser = parser.Serialize(), //CompileParser = parser.Serialize(),
Labels = (from item in Labels select Tuple.Create(item.Key, item.Value)).ToArray(), 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(), 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(), NamespaceLabels = (from item in NamespaceLabels select Tuple.Create(item.Key, item.Value)).ToArray(),
@@ -383,7 +383,7 @@ namespace Convention.RScript
{ {
return new SerializableClass() return new SerializableClass()
{ {
CompileParser = parser.Serialize(), //CompileParser = parser.Serialize(),
Labels = (from item in Labels select Tuple.Create(item.Key, item.Value)).ToArray(), 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(), 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(), NamespaceLabels = (from item in NamespaceLabels select Tuple.Create(item.Key, item.Value)).ToArray(),

15
RScriptSerializer.cs
View File

@@ -89,8 +89,6 @@ namespace Convention.RScript
// 反序列化 Sentences 数组 // 反序列化 Sentences 数组
int sentencesLength = reader.ReadInt32(); int sentencesLength = reader.ReadInt32();
if (sentencesLength > 0)
{
result.Sentences = new RScriptSentence[sentencesLength]; result.Sentences = new RScriptSentence[sentencesLength];
for (int i = 0; i < sentencesLength; i++) for (int i = 0; i < sentencesLength; i++)
{ {
@@ -110,12 +108,9 @@ namespace Convention.RScript
sentence.mode = (RScriptSentence.Mode)reader.ReadInt32(); sentence.mode = (RScriptSentence.Mode)reader.ReadInt32();
result.Sentences[i] = sentence; result.Sentences[i] = sentence;
} }
}
// 反序列化 Labels 数组 // 反序列化 Labels 数组
int labelsLength = reader.ReadInt32(); int labelsLength = reader.ReadInt32();
if (labelsLength > 0)
{
result.Labels = new Tuple<string, int>[labelsLength]; result.Labels = new Tuple<string, int>[labelsLength];
for (int i = 0; i < labelsLength; i++) for (int i = 0; i < labelsLength; i++)
{ {
@@ -123,12 +118,9 @@ namespace Convention.RScript
int item2 = reader.ReadInt32(); int item2 = reader.ReadInt32();
result.Labels[i] = Tuple.Create(item1, item2); result.Labels[i] = Tuple.Create(item1, item2);
} }
}
// 反序列化 NamespaceLayer 数组 // 反序列化 NamespaceLayer 数组
int namespaceLayerLength = reader.ReadInt32(); int namespaceLayerLength = reader.ReadInt32();
if (namespaceLayerLength > 0)
{
result.NamespaceLayer = new Tuple<int, int>[namespaceLayerLength]; result.NamespaceLayer = new Tuple<int, int>[namespaceLayerLength];
for (int i = 0; i < namespaceLayerLength; i++) for (int i = 0; i < namespaceLayerLength; i++)
{ {
@@ -136,12 +128,9 @@ namespace Convention.RScript
int item2 = reader.ReadInt32(); int item2 = reader.ReadInt32();
result.NamespaceLayer[i] = Tuple.Create(item1, item2); result.NamespaceLayer[i] = Tuple.Create(item1, item2);
} }
}
// 反序列化 NamespaceLabels 数组 // 反序列化 NamespaceLabels 数组
int namespaceLabelsLength = reader.ReadInt32(); int namespaceLabelsLength = reader.ReadInt32();
if (namespaceLabelsLength > 0)
{
result.NamespaceLabels = new Tuple<string, int>[namespaceLabelsLength]; result.NamespaceLabels = new Tuple<string, int>[namespaceLabelsLength];
for (int i = 0; i < namespaceLabelsLength; i++) for (int i = 0; i < namespaceLabelsLength; i++)
{ {
@@ -149,12 +138,9 @@ namespace Convention.RScript
int item2 = reader.ReadInt32(); int item2 = reader.ReadInt32();
result.NamespaceLabels[i] = Tuple.Create(item1, item2); result.NamespaceLabels[i] = Tuple.Create(item1, item2);
} }
}
// 反序列化 JumpPointerCache 数组 // 反序列化 JumpPointerCache 数组
int jumpPointerCacheLength = reader.ReadInt32(); int jumpPointerCacheLength = reader.ReadInt32();
if (jumpPointerCacheLength > 0)
{
result.JumpPointerCache = new Tuple<Tuple<int, int>, Tuple<int, int>>[jumpPointerCacheLength]; result.JumpPointerCache = new Tuple<Tuple<int, int>, Tuple<int, int>>[jumpPointerCacheLength];
for (int i = 0; i < jumpPointerCacheLength; i++) for (int i = 0; i < jumpPointerCacheLength; i++)
{ {
@@ -164,7 +150,6 @@ namespace Convention.RScript
int w = reader.ReadInt32(); int w = reader.ReadInt32();
result.JumpPointerCache[i] = Tuple.Create(Tuple.Create(x, y), Tuple.Create(z, w)); result.JumpPointerCache[i] = Tuple.Create(Tuple.Create(x, y), Tuple.Create(z, w));
} }
}
return result; return result;
} }