qrakhen/qamp
qrakhen
/
qamp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add array add, set, get

This commit is contained in:
Qrakhen 2025-11-18 00:21:06 +01:00
parent e86f463de6
commit c097e42c09
5 changed files with 113 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
Qrakhen.Qamp.CLI/Program.cs
View File

@ -34,116 +34,9 @@ void Init(string[] args)
} }
Init(args); Init(args);
void git(string path, string cmd)
{
Console.WriteLine($" > git {cmd}");
ProcessStartInfo info = new ProcessStartInfo{
WorkingDirectory = path,
FileName = "git",
Arguments = cmd
};
Process.Start(info)?.WaitForExit();
}
void del(string path, string cmd)
{
Console.WriteLine($" > git {cmd}");
ProcessStartInfo info = new ProcessStartInfo{
WorkingDirectory = path,
FileName = "del",
Arguments = $"{cmd} /F /Q /S"
};
Process.Start(info)?.WaitForExit();
}
string x = @"C:\Users\filos\projects";
string[] check = ["node_modules", "bin", "obj", "Library"];
int scanx(string path)
{
foreach (var dir in Directory.EnumerateDirectories(path)) {
try {
var name = dir.Replace(path, "").Replace(@"\", "");
if (!check.Contains(name)) {
scanx(dir);
} else {
Console.WriteLine(dir + " (" + (Directory.GetFiles(dir).Length + Directory.GetDirectories(dir).Length) + " files)");
if ((Directory.GetFiles(dir).Length + Directory.GetDirectories(dir).Length) == 0) {
Console.WriteLine(" skipped (0 files)");
continue;
}
if (name == "Library") {
if (!Directory.Exists(path + "\\Assets")) {
Console.WriteLine(" skipped (not a definite unity library folder)");
continue;
}
}
Console.Write(name == "Library" ? " y/n?" : "");
do {
char c = name == "Library" ? Console.ReadKey(true).KeyChar : 'y';
if (c == 'y') {
Directory.Delete(dir, true);
break;
} else if (c == 'n') {
break;
} else {
Console.WriteLine(string.Join("\n", Directory.EnumerateDirectories(dir).Select(_ => $" + {_}")));
Console.WriteLine(string.Join("\n", Directory.EnumerateFiles(dir).Select(_ => $" - {_}")));
}
} while (true);
}
} catch(Exception e) { Console.WriteLine("ERROR: " + e.Message); }
}
return 0;
}
scanx(x);
return;
string path = @"C:\Users\filos\projects";
string[] ignore = ["node_modules", "bin", "obj", "Debug", "Build", ".vs"];
int scan(string path)
{
foreach (var dir in Directory.EnumerateDirectories(path)) {
var name = dir.Replace(path, "").Replace(@"\", "");
if (ignore.Contains(name))
continue;
if (name == ".git") {
Console.WriteLine(path);
git(path, "status");
Console.Write("y/n? ");
do {
char c = (char)Console.Read();
if (c == 'y') {
Console.Write(" origin [master]? ");
string t = Console.ReadLine() ?? "master";
if (string.IsNullOrEmpty(t))
t = "master";
git(path, "add .");
git(path, "commit -m \"backup commit\"");
git(path, "push origin " + t);
break;
} else if (c == 'n') {
break;
} else if (c > '0' && c < '9') {
return (48 - c);
}
} while (true);
} else {
int e = scan(dir);
if (e < 0)
return e+1;
}
}
return 0;
}
scan(path);
return;
*/ */
List<char> Ignored = [ '\0', '\b' ]; List<char> Ignored = [ '\0', '\b' ];
LoggerService.Default = LogLevel.Error; LoggerService.Default = LogLevel.Error;
List<byte[]> History = []; List<byte[]> History = [];

124
Qrakhen.Qamp.Core/Compilation/ExpressionParser.cs
View File

@ -111,7 +111,13 @@ public static class ExpressionParser
digester.EmitDynamic(OpCode.Array, length); // digester.MakeConstant(new Value((long)length))); digester.EmitDynamic(OpCode.Array, length); // digester.MakeConstant(new Value((long)length)));
} }
static void ArrayAccessor(Digester digester, bool canAssign) static void ArrayAdd(Digester digester, bool canAssign)
{
digester.ParseExpression();
digester.Emit(OpCode.ArrayAdd);
}
static void Accessor(Digester digester, bool canAssign)
{ {
digester.ParseExpression(); digester.ParseExpression();
digester.Consume(TokenType.ArrayClose, "expected ] after array accessor"); digester.Consume(TokenType.ArrayClose, "expected ] after array accessor");
@ -242,63 +248,63 @@ public static class ExpressionParser
static ExpressionParser() static ExpressionParser()
{ {
_rules[TokenType.GroupOpen] = new Rule(Group, Call, Weight.Call); _rules[TokenType.GroupOpen] = new Rule(Group, Call, Weight.Call);
_rules[TokenType.GroupClose] = new Rule(null, null, Weight.None); _rules[TokenType.GroupClose] = new Rule(null, null, Weight.None);
_rules[TokenType.ContextOpen] = new Rule(null, null, Weight.None); _rules[TokenType.ContextOpen] = new Rule(null, null, Weight.None);
_rules[TokenType.ContextClose] = new Rule(null, null, Weight.None); _rules[TokenType.ContextClose] = new Rule(null, null, Weight.None);
_rules[TokenType.ArrayOpen] = new Rule(Array, ArrayAccessor, Weight.Call); _rules[TokenType.ArrayOpen] = new Rule(Array, Accessor, Weight.Call);
_rules[TokenType.ArrayClose] = new Rule(null, null, Weight.None); _rules[TokenType.ArrayClose] = new Rule(null, null, Weight.None);
_rules[TokenType.ArrayAdd] = new Rule(null, null, Weight.None); _rules[TokenType.ArrayAdd] = new Rule(null, ArrayAdd, Weight.None);
_rules[TokenType.ArrayRemove] = new Rule(null, null, Weight.None); _rules[TokenType.ArrayRemove] = new Rule(null, null, Weight.None);
_rules[TokenType.Colon] = new Rule(null, Dot, Weight.Call); _rules[TokenType.Colon] = new Rule(null, Dot, Weight.Call);
_rules[TokenType.Comma] = new Rule(null, null, Weight.None); _rules[TokenType.Comma] = new Rule(null, null, Weight.None);
_rules[TokenType.Dot] = new Rule(null, Dot, Weight.Call); _rules[TokenType.Dot] = new Rule(null, Dot, Weight.Call);
_rules[TokenType.Minus] = new Rule(Modifier, Binary, Weight.Term); _rules[TokenType.Minus] = new Rule(Modifier, Binary, Weight.Term);
_rules[TokenType.Plus] = new Rule(null, Binary, Weight.Term); _rules[TokenType.Plus] = new Rule(null, Binary, Weight.Term);
_rules[TokenType.Increment] = new Rule(Binary, Binary, Weight.Call); _rules[TokenType.Increment] = new Rule(Binary, Binary, Weight.Call);
_rules[TokenType.Decrement] = new Rule(Binary, Binary, Weight.Call); _rules[TokenType.Decrement] = new Rule(Binary, Binary, Weight.Call);
_rules[TokenType.BitwiseAnd] = new Rule(Modifier, Binary, Weight.Term); _rules[TokenType.BitwiseAnd] = new Rule(Modifier, Binary, Weight.Term);
_rules[TokenType.BitwiseOr] = new Rule(null, Binary, Weight.Term); _rules[TokenType.BitwiseOr] = new Rule(null, Binary, Weight.Term);
_rules[TokenType.BitwiseXor] = new Rule(null, Binary, Weight.Term); _rules[TokenType.BitwiseXor] = new Rule(null, Binary, Weight.Term);
_rules[TokenType.BitwiseLeft] = new Rule(null, Binary, Weight.Term); _rules[TokenType.BitwiseLeft] = new Rule(null, Binary, Weight.Term);
_rules[TokenType.BitwiseRight] = new Rule(null, Binary, Weight.Term); _rules[TokenType.BitwiseRight] = new Rule(null, Binary, Weight.Term);
_rules[TokenType.BitwiseNot] = new Rule(Modifier, null, Weight.Term); _rules[TokenType.BitwiseNot] = new Rule(Modifier, null, Weight.Term);
_rules[TokenType.Semicolon] = new Rule(null, null, Weight.None); _rules[TokenType.Semicolon] = new Rule(null, null, Weight.None);
_rules[TokenType.Slash] = new Rule(null, Binary, Weight.Factor); _rules[TokenType.Slash] = new Rule(null, Binary, Weight.Factor);
_rules[TokenType.Star] = new Rule(null, Binary, Weight.Factor); _rules[TokenType.Star] = new Rule(null, Binary, Weight.Factor);
_rules[TokenType.Bang] = new Rule(Modifier, null, Weight.None); _rules[TokenType.Bang] = new Rule(Modifier, null, Weight.None);
_rules[TokenType.BangEqual] = new Rule(null, Binary, Weight.Equal); _rules[TokenType.BangEqual] = new Rule(null, Binary, Weight.Equal);
_rules[TokenType.Equal] = new Rule(null, null, Weight.None); _rules[TokenType.Equal] = new Rule(null, null, Weight.None);
_rules[TokenType.EqualEqual] = new Rule(null, Binary, Weight.Equal); _rules[TokenType.EqualEqual] = new Rule(null, Binary, Weight.Equal);
_rules[TokenType.Greater] = new Rule(null, Binary, Weight.Compare); _rules[TokenType.Greater] = new Rule(null, Binary, Weight.Compare);
_rules[TokenType.GreaterEqual] = new Rule(null, Binary, Weight.Compare); _rules[TokenType.GreaterEqual] = new Rule(null, Binary, Weight.Compare);
_rules[TokenType.Less] = new Rule(null, Binary, Weight.Compare); _rules[TokenType.Less] = new Rule(null, Binary, Weight.Compare);
_rules[TokenType.LessEqual] = new Rule(null, Binary, Weight.Compare); _rules[TokenType.LessEqual] = new Rule(null, Binary, Weight.Compare);
_rules[TokenType.Identifier] = new Rule(Variable, null, Weight.None); _rules[TokenType.Identifier] = new Rule(Variable, null, Weight.None);
_rules[TokenType.String] = new Rule(String, null, Weight.None); _rules[TokenType.String] = new Rule(String, null, Weight.None);
_rules[TokenType.Integer] = new Rule(Number, null, Weight.None); _rules[TokenType.Integer] = new Rule(Number, null, Weight.None);
_rules[TokenType.Hexadecimal] = new Rule(Number, null, Weight.None); _rules[TokenType.Hexadecimal] = new Rule(Number, null, Weight.None);
_rules[TokenType.Decimal] = new Rule(Number, null, Weight.None); _rules[TokenType.Decimal] = new Rule(Number, null, Weight.None);
_rules[TokenType.And] = new Rule(null, And, Weight.And); _rules[TokenType.And] = new Rule(null, And, Weight.And);
_rules[TokenType.Class] = new Rule(null, null, Weight.None); _rules[TokenType.Class] = new Rule(null, null, Weight.None);
_rules[TokenType.Else] = new Rule(null, null, Weight.None); _rules[TokenType.Else] = new Rule(null, null, Weight.None);
_rules[TokenType.False] = new Rule(Literal, null, Weight.None); _rules[TokenType.False] = new Rule(Literal, null, Weight.None);
_rules[TokenType.For] = new Rule(null, null, Weight.None); _rules[TokenType.For] = new Rule(null, null, Weight.None);
_rules[TokenType.Function] = new Rule(null, null, Weight.None); _rules[TokenType.Function] = new Rule(null, null, Weight.None);
_rules[TokenType.If] = new Rule(null, null, Weight.None); _rules[TokenType.If] = new Rule(null, null, Weight.None);
_rules[TokenType.Null] = new Rule(Literal, null, Weight.None); _rules[TokenType.Null] = new Rule(Literal, null, Weight.None);
_rules[TokenType.Or] = new Rule(null, Or, Weight.Or); _rules[TokenType.Or] = new Rule(null, Or, Weight.Or);
_rules[TokenType.Print] = new Rule(null, null, Weight.None); _rules[TokenType.Print] = new Rule(null, null, Weight.None);
_rules[TokenType.TypeOf] = new Rule(TypeOf, null, Weight.None); _rules[TokenType.TypeOf] = new Rule(TypeOf, null, Weight.None);
_rules[TokenType.Export] = new Rule(null, null, Weight.None); _rules[TokenType.Export] = new Rule(null, null, Weight.None);
_rules[TokenType.Import] = new Rule(null, null, Weight.None); _rules[TokenType.Import] = new Rule(null, null, Weight.None);
_rules[TokenType.Return] = new Rule(null, null, Weight.None); _rules[TokenType.Return] = new Rule(null, null, Weight.None);
_rules[TokenType.Base] = new Rule(Base, null, Weight.None); _rules[TokenType.Base] = new Rule(Base, null, Weight.None);
_rules[TokenType.This] = new Rule(This, null, Weight.None); _rules[TokenType.This] = new Rule(This, null, Weight.None);
_rules[TokenType.True] = new Rule(Literal, null, Weight.None); _rules[TokenType.True] = new Rule(Literal, null, Weight.None);
_rules[TokenType.Var] = new Rule(null, null, Weight.None); _rules[TokenType.Var] = new Rule(null, null, Weight.None);
_rules[TokenType.While] = new Rule(null, null, Weight.None); _rules[TokenType.While] = new Rule(null, null, Weight.None);
_rules[TokenType.Error] = new Rule(null, null, Weight.None); _rules[TokenType.Error] = new Rule(null, null, Weight.None);
_rules[TokenType.Eof] = new Rule(null, null, Weight.None); _rules[TokenType.Eof] = new Rule(null, null, Weight.None);
} }
} }

32
Qrakhen.Qamp.Core/Execution/Runner.cs
View File

@ -205,17 +205,43 @@ public class Runner : IDisposable
} }
case Op.ArrayGet: { case Op.ArrayGet: {
// attempt to retrieve nth element of array on stack Value index = Pop();
Value array = Pop();
if (!array.Is(T.Array))
return Error($"Can not access {index} of {array} - it is not an array.");
if (index.IsSigned)
Push(array.Ptr.As<Values.Objects.Array>()!.Get((int)index.Signed));
else if (index.IsUnsigned)
Push(array.Ptr.As<Values.Objects.Array>()!.Get((int)index.Unsigned));
else
return Error($"Can not access {index}, index is not an integer.");
break; break;
} }
case Op.ArraySet: { case Op.ArraySet: {
// set nth item on array Value value = Pop();
Value index = Pop();
Value array = Pop();
if (!array.Is(T.Array))
return Error($"Can not access {index} of {array} - it is not an array.");
if (index.IsSigned)
array.Ptr.As<Values.Objects.Array>()!.Set((int)index.Signed, value);
else if (index.IsUnsigned)
array.Ptr.As<Values.Objects.Array>()!.Set((int)index.Signed, value);
else
return Error($"Can not access {index}, index is not an integer.");
break; break;
} }
case Op.ArrayAdd: { case Op.ArrayAdd: {
// add to array Value value = Pop();
Value array = Pop();
if (!array.Is(T.Array))
return Error($"Can not add {value} to {array} - it is not an array.");
array.Ptr.As<Values.Objects.Array>()!.Add(value);
break; break;
} }

14
Qrakhen.Qamp.Core/Tokenization/Reader.cs
View File

@ -318,13 +318,15 @@ public class Reader : IReader<Token>, IDisposable
MakeToken(Equal, buffer), MakeToken(Equal, buffer),
'<' => Check('~') ? '<' => Check('~') ?
MakeToken(Equal, buffer + Next()) : MakeToken(Equal, buffer + Next()) :
Check(':') ? Check(':') ?
MakeToken(Return, buffer + Next()) : MakeToken(Return, buffer + Next()) :
Check('<') ? Check('+') ?
MakeToken(BitwiseLeft, buffer + Next()) : MakeToken(ArrayAdd, buffer + Next()) :
Check('=') ? Check('<') ?
MakeToken(LessEqual, buffer + Next()) : MakeToken(BitwiseLeft, buffer + Next()) :
MakeToken(Less, buffer), Check('=') ?
MakeToken(LessEqual, buffer + Next()) :
MakeToken(Less, buffer),
'>' => Check('>') ? '>' => Check('>') ?
MakeToken(BitwiseRight, buffer + Next()) : MakeToken(BitwiseRight, buffer + Next()) :
Check('=') ? Check('=') ?

11
Qrakhen.Qamp.Core/Values/Objects/Array.cs
View File

@ -6,11 +6,13 @@ public class Array(IEnumerable<Value> data) : Obj(ValueType.Array)
public void Set(int index, Value value) public void Set(int index, Value value)
{ {
AssertWithinBounds(index);
Data[index] = value; Data[index] = value;
} }
public Value Get(int index) public Value Get(int index)
{ {
AssertWithinBounds(index);
return Data[index]; return Data[index];
} }
@ -19,5 +21,12 @@ public class Array(IEnumerable<Value> data) : Obj(ValueType.Array)
Data.Add(value); Data.Add(value);
} }
public override string ToString() => $"[{string.Join(", ", Data)}]"; private void AssertWithinBounds(int index)
{
if (index < 0 || index > Data.Count)
throw new QampException($"Can not access element at index {index}, it is outside of this array's bounds.");
}
public override string ToString() => ToString(true);
public string ToString(bool detail) => detail ? $"[{string.Join(", ", Data)}]" : $"Array[{Data.Count}]";
} }