Skip to content

Commit 04cff43

Browse files
JBrosDevelopmentJBrosDevelopment
committed
v2.4.4 : Updated with litterals and evennt code
1 parent 1a4f1c6 commit 04cff43

12 files changed

Lines changed: 1513 additions & 32 deletions

‎EZCode/Converter.cs‎

Lines changed: 1159 additions & 0 deletions
Large diffs are not rendered by default.

‎EZCode/EZCode.cs‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class EzCode
2323
/// <summary>
2424
/// Directory of the script playing
2525
/// </summary>
26-
public static string Version { get; } = "2.4.1";
26+
public static string Version { get; } = "2.4.4";
2727

2828
#region Variables_and_Initializers
2929
/// <summary>
@@ -1289,9 +1289,17 @@ async Task<string[]> PlaySwitch(string[]? _parts = null, string jumpsto = "", st
12891289
ErrorText(parts, ErrorTypes.missingControl, keyword, name);
12901290
break;
12911291
}
1292+
string file = "";
12921293
string type = parts[2];
1293-
string[] file_r = await getFile(parts, 3);
1294-
string file = file_r[0];
1294+
if (parts[3] == "=>")
1295+
{
1296+
file = string.Join(" ", parts.Skip(4));
1297+
}
1298+
else
1299+
{
1300+
string[] file_r = await getFile(parts, 3);
1301+
file = file_r[0];
1302+
}
12951303
switch (type)
12961304
{
12971305
case "click":
@@ -5121,6 +5129,16 @@ string[] getString_value(string[] parts, int next, bool all = false, bool useVar
51215129
val = s;
51225130
List<string> texts = s.Split(" ").ToList();
51235131

5132+
if (val.StartsWith("@s:"))
5133+
{
5134+
return new string[] { val.Remove(0, 3), next.ToString() };
5135+
}
5136+
if (val.StartsWith("\\@s:"))
5137+
{
5138+
val = val.Remove(0, 1);
5139+
texts = val.Split(" ").ToList();
5140+
}
5141+
51245142
if (useEquation && s.Contains(@"\(") && !s.Contains(@"\\("))
51255143
{
51265144
for (int i = 0; i < texts.Count; i++)
@@ -5525,7 +5543,7 @@ private async void PlayScriptFromEvent(object sender, eventType eventtype)
55255543
case eventType.resizestart: file = w.resizedstart; break;
55265544
case eventType.resizeend: file = w.resizedend; break;
55275545
}
5528-
if (!file.Contains(":")) isfile = false;
5546+
if (!file.Contains(":\\")) isfile = false;
55295547
if (isfile) await PlaySwitch(jumpsto: $"file play {file}");
55305548
else await PlaySwitch(jumpsto: file);
55315549
}

‎EZ_IDE/EZCode_Syntax.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<style name="Comment" color="Green" fontStyle="Regular"/>
66
<rule style="Comment">\/\/(.*?)(?:\||$|(?:\r?\n|$))</rule>
77

8+
<style name="Litteral" color="SkyBlue" fontStyle="Regular"/>
9+
<rule style="Litteral">@s:(.*?)(?:\||$|(?:\r?\n|$))</rule>
10+
811
<style name="Hashtag" color="Orange" fontStyle="Regular"/>
912
<rule style="Hashtag"> #.*|^\s*#.*|\n#.*</rule>
1013

@@ -18,7 +21,7 @@
1821
<rule style="Keyword">\b(list|group|sound|var|print|await|bringto|clear|instance|destroy|event|file|input|math|intersects|messagebox|stop|shape|textbox|label|button|window|global)\b</rule>
1922

2023
<style name="Sky" color="SkyBlue" fontStyle="Regular"/>
21-
<rule style="Sky">'(.*?)'|=|-|\+|\*|/|!|\&amp;|~/|~\\</rule>
24+
<rule style="Sky">'(.*?)'|=|:|=&gt;|-|\+|\*|/|!|\&amp;|~/|~\\</rule>
2225

2326
<style name="LightGreen" color="PaleGreen" fontStyle="Regular"/>
2427
<rule style="LightGreen">\b(-?[0-9]\d*)\b</rule>

‎EZ_IDE/IDE.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace EZ_IDE
1313
{
1414
public partial class IDE : Form
1515
{
16-
public static readonly string Version = "1.2.1";
16+
public static readonly string Version = "1.2.2";
1717

1818
#region AutoComplete
1919
readonly AutocompleteMenu popupMenu;

‎Test-Environment/ConverterExample.Designer.cs‎

Lines changed: 143 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Test-Environment/ConverterExample.cs‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
namespace TestEnvironment
2+
{
3+
using EZCode.Converter;
4+
using System.Windows.Forms;
5+
using RegestrySettings;
6+
7+
public partial class ConverterExample : Form
8+
{
9+
public Converter converter = new Converter();
10+
public ConverterExample()
11+
{
12+
InitializeComponent();
13+
Settings.keyName = @"JBrosDevelopment\EZCode\TestEnvironment";
14+
Language.DataSource = Enum.GetValues(typeof(Converter.ProgrammingLanguage));
15+
main.Text = Settings.GetKey("ConverterText", "") != null ? Settings.GetKey("ConverterText", "")!.ToString() : "";
16+
string Lang = Settings.GetKey("ConverterLanguage", "") != null ? Settings.GetKey("ConverterLanguage", "")!.ToString() : "";
17+
18+
Converter.ProgrammingLanguage language;
19+
Enum.TryParse(Lang, out language);
20+
Language.SelectedIndex = Language.Items.Cast<Converter.ProgrammingLanguage>().ToList().IndexOf(language);
21+
}
22+
private void generate_Click(object sender, EventArgs e)
23+
{
24+
Converter.ProgrammingLanguage language;
25+
Enum.TryParse(Language.SelectedValue.ToString(), out language);
26+
27+
converted.Text = converter.Convert(language, main.Text);
28+
}
29+
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
30+
{
31+
if (msg.Msg == 256)
32+
{
33+
if (keyData == (Keys.G | Keys.Control))
34+
{
35+
generate.PerformClick();
36+
}
37+
}
38+
return base.ProcessCmdKey(ref msg, keyData);
39+
}
40+
protected override void OnClosed(EventArgs e)
41+
{
42+
Settings.SetKey("ConverterText", main.Text);
43+
Settings.SetKey("ConverterLanguage", Language.SelectedValue.ToString());
44+
base.OnClosed(e);
45+
}
46+
}
47+
}

‎Test-Environment/ConverterExample.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

0 commit comments

Comments
 (0)