Skip to content

Commit b68ec62

Browse files
Unknown6656Unknown6656
committed
Finished implementing the interactive framework (resolves #38)
1 parent e6bdbc2 commit b68ec62

File tree

7 files changed

+46
-21
lines changed

7 files changed

+46
-21
lines changed

‎new/AutoItInterpreter/AssemblyInfo.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
//////////////////////////////////////////////////////////////////////////
3-
// Auto-generated 2020-08-19 23:12:59.967 //
3+
// Auto-generated 2020-08-19 23:50:42.863 //
44
// ANY CHANGES TO THIS DOCUMENT WILL BE LOST UPON RE-GENERATION //
55
//////////////////////////////////////////////////////////////////////////
66

77
using System.Reflection;
88
using System;
99

10-
[assembly: AssemblyVersion("0.6.1574.7352")]
11-
[assembly: AssemblyFileVersion("0.6.1574.7352")]
12-
[assembly: AssemblyInformationalVersion("v.0.6.1574.7352, commit: c9995acd9fab2caa5dfac4aa56a21449b54eabff")]
10+
[assembly: AssemblyVersion("0.6.1581.7352")]
11+
[assembly: AssemblyFileVersion("0.6.1581.7352")]
12+
[assembly: AssemblyInformationalVersion("v.0.6.1581.7352, commit: e6bdbc225381d594326c7089bdc18bdbca7cc53e")]
1313
[assembly: AssemblyCompany("Unknown6656")]
1414
[assembly: AssemblyCopyright("Copyright © 2018 - 2020, Unknown6656")]
1515
[assembly: AssemblyProduct("AutoIt-Interpreter by Unknown6656")]
@@ -35,11 +35,11 @@ public static class __module__
3535
/// <summary>
3636
/// The interpreter's current version.
3737
/// </summary>
38-
public static Version? InterpreterVersion { get; } = Version.Parse("0.6.1574.7352");
38+
public static Version? InterpreterVersion { get; } = Version.Parse("0.6.1581.7352");
3939
/// <summary>
4040
/// The Git hash associated with the current build.
4141
/// </summary>
42-
public const string GitHash = "c9995acd9fab2caa5dfac4aa56a21449b54eabff";
42+
public const string GitHash = "e6bdbc225381d594326c7089bdc18bdbca7cc53e";
4343
/// <summary>
4444
/// The name of the GitHub repository associated with <see cref="RepositoryURL"/>.
4545
/// </summary>
@@ -49,7 +49,7 @@ public static class __module__
4949
/// </summary>
5050
public const string RepositoryURL = "https://github.com/Unknown6656/AutoIt-Interpreter";
5151
/// <summary>
52-
/// The date and time of the current build (2020-08-19 23:12:59.967).
52+
/// The date and time of the current build (2020-08-19 23:50:42.863).
5353
/// </summary>
54-
public static DateTime DateBuilt { get; } = DateTime.FromFileTimeUtc(0x01d6766d84735200L);
54+
public static DateTime DateBuilt { get; } = DateTime.FromFileTimeUtc(0x01d67672c93dd51bL);
5555
}

‎new/AutoItInterpreter/CLI/InteractiveShell.cs

+17-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Unknown6656.Controls.Console;
88
using Unknown6656.Imaging;
99
using System.Windows.Forms;
10+
using Unknown6656.AutoIt3.Parser.ExpressionParser;
1011

1112
namespace Unknown6656.AutoIt3.CLI
1213
{
@@ -77,11 +78,14 @@ private set
7778

7879
public AU3Thread Thread { get; }
7980

81+
public AU3CallFrame CallFrame { get; }
82+
8083

8184
public InteractiveShell(Interpreter interpreter)
8285
{
8386
Interpreter = interpreter;
8487
Thread = interpreter.CreateNewThread();
88+
CallFrame = Thread.PushAnonymousCallFrame();
8589
}
8690

8791
~InteractiveShell() => Dispose(disposing: false);
@@ -502,9 +506,18 @@ private void ProcessInput()
502506
else
503507
try
504508
{
505-
// TODO : actual processing
509+
CallFrame.InsertReplaceSourceCode(CallFrame.CurrentInstructionPointer, input);
510+
511+
InterpreterResult? result = CallFrame.ParseCurrentLine();
506512

507-
_ = Thread;
513+
if (result?.OptionalError is { Message: string error })
514+
History.Add((new[] { new ScriptToken(0, 0, error.Length, error, TokenType.UNKNOWN) }, InteractiveShellStreamDirection.Error));
515+
else if (CallFrame.VariableResolver.TryGetVariable(AST.VARIABLE.Discard, VariableSearchScope.Global, out Variable? variable))
516+
{
517+
string text = variable.Value.ToDebugString(Interpreter);
518+
519+
History.Add((new[] { new ScriptToken(0, 0, text.Length, text, TokenType.Comment) }, InteractiveShellStreamDirection.Output));
520+
}
508521
}
509522
catch
510523
{
@@ -554,7 +567,8 @@ public void UpdateSuggestions()
554567
filter = null;
555568

556569
Suggestions.AddRange(from s in suggestions.Distinct()
557-
let text = s + ' '
570+
let text = s.Trim() + ' '
571+
where text.Length > 1
558572
let tokens = ScriptVisualizer.TokenizeScript(text)[..^1]
559573
let first = tokens[0]
560574
where filter is null || first.Content.StartsWith(filter, StringComparison.InvariantCultureIgnoreCase)

‎new/AutoItInterpreter/CLI/ScriptVisualizer.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public static class ScriptVisualizer
2929
{
3030
// [TokenType.NewLine] = RGBAColor.White,
3131
// [TokenType.Whitespace] = RGBAColor.White,
32-
[TokenType.Keyword] = RGBAColor.DodgerBlue,
33-
[TokenType.FunctionCall] = RGBAColor.LightBlue,
32+
[TokenType.Keyword] = RGBAColor.CornflowerBlue,
33+
[TokenType.FunctionCall] = RGBAColor.LightCyan,
3434
[TokenType.Identifier] = RGBAColor.White,
3535
[TokenType.Comment] = RGBAColor.DarkSeaGreen,
3636
[TokenType.Number] = RGBAColor.Moccasin,
@@ -96,12 +96,12 @@ void add_token(int length, TokenType type)
9696
}
9797
else if (line.Match(REGEX_STRING, out match))
9898
add_token(match.Length, TokenType.String);
99+
else if (line.Match(REGEX_KEYWORD, out match))
100+
add_token(match.Length, TokenType.Keyword);
99101
else if (line.Match(REGEX_SYMOBLS, out match))
100102
add_token(match.Length, TokenType.Symbol);
101103
else if (line.Match(REGEX_OPERATORS, out match))
102104
add_token(match.Length, TokenType.Operator);
103-
else if (line.Match(REGEX_KEYWORD, out match))
104-
add_token(match.Length, TokenType.Keyword);
105105
else if (line.Match(REGEX_VARIABLE, out match))
106106
add_token(match.Length, TokenType.Variable);
107107
else if (line.Match(REGEX_MACRO, out match))

‎new/AutoItInterpreter/Runtime/AU3Thread.cs

+10-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public Union<InterpreterError, Variant> Call(ScriptFunction function, Variant[]
119119
throw new ObjectDisposedException(nameof(AU3Thread));
120120

121121
CallFrame? old = CurrentFrame;
122-
CallFrame frame = function switch
122+
using CallFrame frame = function switch
123123
{
124124
AU3Function f => new AU3CallFrame(this, old, f, args),
125125
NativeFunction f => new NativeCallFrame(this, old, f, args),
@@ -165,10 +165,18 @@ public void Stop(int exitcode)
165165
_callstack.TryPop(out CallFrame? frame);
166166
frame?.Dispose();
167167

168-
169168
return CurrentLocation;
170169
}
171170

171+
internal AU3CallFrame PushAnonymousCallFrame()
172+
{
173+
AU3CallFrame frame = new AU3CallFrame(this, CurrentFrame, Interpreter.ScriptScanner.AnonymousFunction, Array.Empty<Variant>());
174+
175+
_callstack.Push(frame);
176+
177+
return frame;
178+
}
179+
172180
/// <inheritdoc/>
173181
public override string ToString() => $"0x{ThreadID:x4}{(IsMainThread ? " (main)" : "")} @ {CurrentLocation}";
174182

‎new/AutoItInterpreter/Runtime/CallFrame.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ private string InsertInternalJumpLabel()
465465

466466
return name;
467467
}
468-
469-
private void InsertReplaceSourceCode(int instruction_ptr, params string[] lines)
468+
469+
internal void InsertReplaceSourceCode(int instruction_ptr, params string[] lines)
470470
{
471471
int eip = _instruction_pointer;
472472

‎new/AutoItInterpreter/Runtime/ScriptScanner.cs

+3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ from frame in thread.CallStack
5959

6060
internal ScannedScript SystemScript { get; }
6161

62+
internal AU3Function AnonymousFunction { get; }
63+
6264
public Interpreter Interpreter { get; }
6365

6466
public IEnumerable<ScriptFunction> CachedFunctions => _cached_functions.Values;
@@ -70,6 +72,7 @@ public ScriptScanner(Interpreter interpreter)
7072
{
7173
Interpreter = interpreter;
7274
SystemScript = new ScannedScript(MainProgram.ASM_FILE, "");
75+
AnonymousFunction = new AU3Function(SystemScript, "", null);
7376
}
7477

7578
internal void ScanNativeFunctions() => Interpreter.Telemetry.Measure(TelemetryCategory.ScanScript, delegate

‎new/AutoItInterpreter/version.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
0.6.1574.7352
2-
c9995acd9fab2caa5dfac4aa56a21449b54eabff
1+
0.6.1581.7352
2+
e6bdbc225381d594326c7089bdc18bdbca7cc53e

0 commit comments

Comments
 (0)