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

新增Enum支持

Browse Source
This commit is contained in:
LiuBai095
2025-11-25 17:03:43 +08:00
parent 5b235a7f26
commit 2f24d94db2
3 changed files with 90 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PublicTypes/InjectVariable/CStyle.cs
View File

@@ -116,7 +116,7 @@ namespace Convention.RScript.Variable.CStyle
protected override string WritePageHead(Type currentType) protected override string WritePageHead(Type currentType)
{ {
return $"#include\"{GetFilename(currentType)}\""; return $"#include\"{GetFilename(currentType.BaseType)}\"";
} }
public override string GetFilename(Type currentType) public override string GetFilename(Type currentType)

122
PublicTypes/RScriptInjectVariableGenerater.cs
View File

@@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using UnityEditor;
namespace Convention.RScript.Variable namespace Convention.RScript.Variable
{ {
@@ -115,44 +116,59 @@ namespace Convention.RScript.Variable
StringBuilder builder = new(); StringBuilder builder = new();
builder.AppendLine(this.WritePageHead(targetType)); builder.AppendLine(this.WritePageHead(targetType));
builder.AppendLine(this.WriteClassHead(targetType)); if (targetType.IsEnum)
builder.AppendLine(this.WriteClassBodyEnter(targetType));
// 绘制枚举
{ {
var scriptEnums = from enumItem in targetType.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public) // 绘制枚举
where enumItem.GetCustomAttribute<Attr.EnumAttribute>() != null builder.AppendLine(this.WriteEnumHead(targetType));
select enumItem; builder.AppendLine(this.WriteEnumBodyEnter(targetType));
foreach (var enumItem in scriptEnums) foreach (var enumName in targetType.GetEnumNames())
{ {
var attr = enumItem.GetCustomAttribute<Attr.EnumAttribute>(); builder.AppendLine(this.WriteEnumName(enumName));
this.WriteEnumHead(targetType); }
this.WriteEnumBodyEnter(targetType); builder.AppendLine(this.WriteEnumBodyExit(targetType));
foreach (var enumName in enumItem.GetEnumNames()) builder.AppendLine(this.WriteEnumTail(targetType));
}
else
{
builder.AppendLine(this.WriteClassHead(targetType));
builder.AppendLine(this.WriteClassBodyEnter(targetType));
// 绘制枚举
{
var scriptEnums = from enumItem in targetType.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public)
where enumItem.GetCustomAttribute<Attr.EnumAttribute>() != null
select enumItem;
foreach (var enumItem in scriptEnums)
{ {
this.WriteEnumName(enumName); var attr = enumItem.GetCustomAttribute<Attr.EnumAttribute>();
this.WriteEnumHead(targetType);
this.WriteEnumBodyEnter(targetType);
foreach (var enumName in enumItem.GetEnumNames())
{
this.WriteEnumName(enumName);
}
this.WriteEnumBodyExit(targetType);
this.WriteEnumTail(targetType);
} }
this.WriteEnumBodyExit(targetType);
this.WriteEnumTail(targetType);
} }
} // 绘制方法
// 绘制方法
{
var scriptMethods = from method in targetType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)
where method.GetCustomAttribute<Attr.MethodAttribute>() != null
select method;
foreach (var method in scriptMethods)
{ {
var attr = method.GetCustomAttribute<Attr.MethodAttribute>(); var scriptMethods = from method in targetType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)
var returnType = method.ReturnType; where method.GetCustomAttribute<Attr.MethodAttribute>() != null
var methodName = method.Name; select method;
var parameters = method.GetParameters(); foreach (var method in scriptMethods)
var parameterNames = from item in parameters select item.Name; {
var parameterTypes = from item in parameters select item.ParameterType; var attr = method.GetCustomAttribute<Attr.MethodAttribute>();
builder.AppendLine(this.WriteClassMethod(returnType, methodName, parameterNames.ToArray(), parameterTypes.ToArray())); var returnType = method.ReturnType;
var methodName = method.Name;
var parameters = method.GetParameters();
var parameterNames = from item in parameters select item.Name;
var parameterTypes = from item in parameters select item.ParameterType;
builder.AppendLine(this.WriteClassMethod(returnType, methodName, parameterNames.ToArray(), parameterTypes.ToArray()));
}
} }
builder.AppendLine(this.WriteClassBodyExit(targetType));
builder.AppendLine(this.WriteClassTail(targetType));
} }
builder.AppendLine(this.WriteClassBodyExit(targetType));
builder.AppendLine(this.WriteClassTail(targetType));
builder.AppendLine(this.WritePageEnd(targetType)); builder.AppendLine(this.WritePageEnd(targetType));
this.scriptIndicator = builder.ToString(); this.scriptIndicator = builder.ToString();
} }
@@ -173,20 +189,54 @@ namespace Convention.RScript.Variable
return AllRScriptInjectVariables.Remove(name); return AllRScriptInjectVariables.Remove(name);
} }
public class EnumGetter
{
public Type enumType;
public EnumGetter(Type enumType)
{
this.enumType = enumType;
}
public object Get(string name)
{
return Enum.Parse(enumType, name);
}
}
public static object GenerateRScriptVariable(string name) public static object GenerateRScriptVariable(string name)
{ {
if (AllRScriptInjectVariables.TryGetValue(name, out var variable)) if (AllRScriptInjectVariables.TryGetValue(name, out var variable))
{ {
if (variable.MyGenerater != null) if (variable.targetType.IsEnum)
{ {
var result = variable.Generate(); if (variable.MyGenerater != null)
if (result.GetType().IsSubclassOf(variable.targetType) || result.GetType() == variable.targetType)
{ {
variable.GenerateObjects.Add(result); var result = variable.Generate();
return result; if (result.GetType().IsSubclassOf(variable.targetType) || result.GetType() == variable.targetType)
{
variable.GenerateObjects.Add(result);
return result;
}
else
throw new InvalidOperationException($"{name} target is not sub-class of it's target type");
} }
else else
throw new InvalidOperationException($"{name} target is not sub-class of it's target type"); {
return variable.targetType;
}
}
else
{
if (variable.MyGenerater != null)
{
var result = variable.Generate();
if (result.GetType().IsSubclassOf(variable.targetType) || result.GetType() == variable.targetType)
{
variable.GenerateObjects.Add(result);
return result;
}
else
throw new InvalidOperationException($"{name} target is not sub-class of it's target type");
}
} }
} }
throw new InvalidOperationException($"{name} target is not exist or abstract"); throw new InvalidOperationException($"{name} target is not exist or abstract");

3
RScriptContext.cs
View File

@@ -6,6 +6,7 @@ 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 UnityEngine;
using static Convention.RScript.RScriptContext; using static Convention.RScript.RScriptContext;
namespace Convention.RScript namespace Convention.RScript
@@ -276,10 +277,12 @@ namespace Convention.RScript
} }
catch (RScriptException) catch (RScriptException)
{ {
Debug.LogError($"current sentence: {sentence}");
throw; throw;
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.LogError($"current sentence: {sentence}");
throw new RScriptRuntimeException($"Runtime error: {ex.Message}", CurrentRuntimePointer, ex); throw new RScriptRuntimeException($"Runtime error: {ex.Message}", CurrentRuntimePointer, ex);
} }
} }