Skip to content

Commit d414d3e

Browse files
author
Viktor Chernev
committed
work on Describe 1.0 Preprocessor
1 parent f31491d commit d414d3e

File tree

19 files changed

+13366
-249
lines changed

19 files changed

+13366
-249
lines changed

‎@DescribeCompilerAPI/Compiler/Compiler/Compiler.cs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial class DescribeCompiler
2222
/// <summary>
2323
/// The optimizer class
2424
/// </summary>
25-
public IDescribeOptimizer Optimizer
25+
public IDescribeOptimizer _Optimizer
2626
{
2727
get;
2828
set;
@@ -31,7 +31,7 @@ public IDescribeOptimizer Optimizer
3131
/// <summary>
3232
/// The preprocessor class
3333
/// </summary>
34-
public IDescribePreprocessor Preprocessor
34+
public IDescribePreprocessor _Preprocessor
3535
{
3636
get;
3737
set;
@@ -56,29 +56,28 @@ public bool ChangeGrammar(GrammarName grammarName)
5656
switch (grammarName)
5757
{
5858
case GrammarName.Basic:
59-
Optimizer = new OptimizerForDescribe06();
60-
Preprocessor = new PreprocessorForDescribe06();
59+
_Optimizer = new OptimizerForDescribe06();
60+
_Preprocessor = new PreprocessorForDescribe06();
6161
break;
6262
case GrammarName.Tags:
63-
Optimizer = new OptimizerForDescribe07();
64-
Preprocessor = new PreprocessorForDescribe07();
63+
_Optimizer = new OptimizerForDescribe07();
64+
_Preprocessor = new PreprocessorForDescribe07();
6565
break;
6666
case GrammarName.Links:
67-
Optimizer = new OptimizerForDescribe08();
68-
Preprocessor = new PreprocessorForDescribe08();
67+
_Optimizer = new OptimizerForDescribe08();
68+
_Preprocessor = new PreprocessorForDescribe08();
6969
break;
7070
case GrammarName.Decorators:
71-
Optimizer = new OptimizerForDescribe09();
72-
Preprocessor = new PreprocessorForDescribe09();
71+
_Optimizer = new OptimizerForDescribe09();
72+
_Preprocessor = new PreprocessorForDescribe09();
7373
break;
7474
case GrammarName.Official:
7575
default:
76-
Optimizer = new DefaultOptimizer();
77-
//Optimizer = new OptimizerForDescribe10();
78-
Preprocessor = new PreprocessorForDescribe10();
76+
_Optimizer = new OptimizerForDescribe10();
77+
_Preprocessor = new PreprocessorForDescribe10();
7978
break;
8079
}
81-
Optimizer = new DefaultOptimizer();
80+
_Optimizer = new DefaultOptimizer();
8281
LogInfo("Loaded new grammar: \"" + fullname + "\"");
8382
return true;
8483
}

‎@DescribeCompilerAPI/Compiler/Compiler/Constructors.cs‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ public DescribeCompiler()
1919
switch (DEFAULT_GRAMMAR)
2020
{
2121
case GrammarName.Basic:
22-
Optimizer = new OptimizerForDescribe06();
23-
Preprocessor = new PreprocessorForDescribe06();
22+
_Optimizer = new OptimizerForDescribe06();
23+
_Preprocessor = new PreprocessorForDescribe06();
2424
break;
2525
case GrammarName.Tags:
26-
Optimizer = new OptimizerForDescribe07();
27-
Preprocessor = new PreprocessorForDescribe07();
26+
_Optimizer = new OptimizerForDescribe07();
27+
_Preprocessor = new PreprocessorForDescribe07();
2828
break;
2929
case GrammarName.Links:
30-
Optimizer = new OptimizerForDescribe08();
31-
Preprocessor = new PreprocessorForDescribe08();
30+
_Optimizer = new OptimizerForDescribe08();
31+
_Preprocessor = new PreprocessorForDescribe08();
3232
break;
3333
case GrammarName.Decorators:
34-
Optimizer = new OptimizerForDescribe09();
35-
Preprocessor = new PreprocessorForDescribe09();
34+
_Optimizer = new OptimizerForDescribe09();
35+
_Preprocessor = new PreprocessorForDescribe09();
3636
break;
3737
case GrammarName.Official:
3838
default:
39-
Optimizer = new DefaultOptimizer();
40-
Preprocessor = new PreprocessorForDescribe10();
39+
_Optimizer = new OptimizerForDescribe10();
40+
_Preprocessor = new PreprocessorForDescribe10();
4141
break;
4242
}
4343

@@ -60,25 +60,25 @@ public DescribeCompiler(
6060
switch (DEFAULT_GRAMMAR)
6161
{
6262
case GrammarName.Basic:
63-
Optimizer = new OptimizerForDescribe06();
64-
Preprocessor = new PreprocessorForDescribe06();
63+
_Optimizer = new OptimizerForDescribe06();
64+
_Preprocessor = new PreprocessorForDescribe06();
6565
break;
6666
case GrammarName.Tags:
67-
Optimizer = new OptimizerForDescribe07();
68-
Preprocessor = new PreprocessorForDescribe07();
67+
_Optimizer = new OptimizerForDescribe07();
68+
_Preprocessor = new PreprocessorForDescribe07();
6969
break;
7070
case GrammarName.Links:
71-
Optimizer = new OptimizerForDescribe08();
72-
Preprocessor = new PreprocessorForDescribe08();
71+
_Optimizer = new OptimizerForDescribe08();
72+
_Preprocessor = new PreprocessorForDescribe08();
7373
break;
7474
case GrammarName.Decorators:
75-
Optimizer = new OptimizerForDescribe09();
76-
Preprocessor = new PreprocessorForDescribe09();
75+
_Optimizer = new OptimizerForDescribe09();
76+
_Preprocessor = new PreprocessorForDescribe09();
7777
break;
7878
case GrammarName.Official:
7979
default:
80-
Optimizer = new DefaultOptimizer();
81-
Preprocessor = new PreprocessorForDescribe10();
80+
_Optimizer = new OptimizerForDescribe10();
81+
_Preprocessor = new PreprocessorForDescribe10();
8282
break;
8383
}
8484

@@ -104,25 +104,25 @@ public DescribeCompiler(
104104
switch (DEFAULT_GRAMMAR)
105105
{
106106
case GrammarName.Basic:
107-
Optimizer = new OptimizerForDescribe06();
108-
Preprocessor = new PreprocessorForDescribe06();
107+
_Optimizer = new OptimizerForDescribe06();
108+
_Preprocessor = new PreprocessorForDescribe06();
109109
break;
110110
case GrammarName.Tags:
111-
Optimizer = new OptimizerForDescribe07();
112-
Preprocessor = new PreprocessorForDescribe07();
111+
_Optimizer = new OptimizerForDescribe07();
112+
_Preprocessor = new PreprocessorForDescribe07();
113113
break;
114114
case GrammarName.Links:
115-
Optimizer = new OptimizerForDescribe08();
116-
Preprocessor = new PreprocessorForDescribe08();
115+
_Optimizer = new OptimizerForDescribe08();
116+
_Preprocessor = new PreprocessorForDescribe08();
117117
break;
118118
case GrammarName.Decorators:
119-
Optimizer = new OptimizerForDescribe09();
120-
Preprocessor = new PreprocessorForDescribe09();
119+
_Optimizer = new OptimizerForDescribe09();
120+
_Preprocessor = new PreprocessorForDescribe09();
121121
break;
122122
case GrammarName.Official:
123123
default:
124-
Optimizer = new DefaultOptimizer();
125-
Preprocessor = new PreprocessorForDescribe10();
124+
_Optimizer = new OptimizerForDescribe10();
125+
_Preprocessor = new PreprocessorForDescribe10();
126126
break;
127127
}
128128

@@ -152,25 +152,25 @@ public DescribeCompiler(
152152
switch (DEFAULT_GRAMMAR)
153153
{
154154
case GrammarName.Basic:
155-
Optimizer = new OptimizerForDescribe06();
156-
Preprocessor = new PreprocessorForDescribe06();
155+
_Optimizer = new OptimizerForDescribe06();
156+
_Preprocessor = new PreprocessorForDescribe06();
157157
break;
158158
case GrammarName.Tags:
159-
Optimizer = new OptimizerForDescribe07();
160-
Preprocessor = new PreprocessorForDescribe07();
159+
_Optimizer = new OptimizerForDescribe07();
160+
_Preprocessor = new PreprocessorForDescribe07();
161161
break;
162162
case GrammarName.Links:
163-
Optimizer = new OptimizerForDescribe08();
164-
Preprocessor = new PreprocessorForDescribe08();
163+
_Optimizer = new OptimizerForDescribe08();
164+
_Preprocessor = new PreprocessorForDescribe08();
165165
break;
166166
case GrammarName.Decorators:
167-
Optimizer = new OptimizerForDescribe09();
168-
Preprocessor = new PreprocessorForDescribe09();
167+
_Optimizer = new OptimizerForDescribe09();
168+
_Preprocessor = new PreprocessorForDescribe09();
169169
break;
170170
case GrammarName.Official:
171171
default:
172-
Optimizer = new DefaultOptimizer();
173-
Preprocessor = new PreprocessorForDescribe10();
172+
_Optimizer = new OptimizerForDescribe10();
173+
_Preprocessor = new PreprocessorForDescribe10();
174174
break;
175175
}
176176

@@ -204,25 +204,25 @@ public DescribeCompiler(
204204
switch (DEFAULT_GRAMMAR)
205205
{
206206
case GrammarName.Basic:
207-
Optimizer = new OptimizerForDescribe06();
208-
Preprocessor = new PreprocessorForDescribe06();
207+
_Optimizer = new OptimizerForDescribe06();
208+
_Preprocessor = new PreprocessorForDescribe06();
209209
break;
210210
case GrammarName.Tags:
211-
Optimizer = new OptimizerForDescribe07();
212-
Preprocessor = new PreprocessorForDescribe07();
211+
_Optimizer = new OptimizerForDescribe07();
212+
_Preprocessor = new PreprocessorForDescribe07();
213213
break;
214214
case GrammarName.Links:
215-
Optimizer = new OptimizerForDescribe08();
216-
Preprocessor = new PreprocessorForDescribe08();
215+
_Optimizer = new OptimizerForDescribe08();
216+
_Preprocessor = new PreprocessorForDescribe08();
217217
break;
218218
case GrammarName.Decorators:
219-
Optimizer = new OptimizerForDescribe09();
220-
Preprocessor = new PreprocessorForDescribe09();
219+
_Optimizer = new OptimizerForDescribe09();
220+
_Preprocessor = new PreprocessorForDescribe09();
221221
break;
222222
case GrammarName.Official:
223223
default:
224-
Optimizer = new DefaultOptimizer();
225-
Preprocessor = new PreprocessorForDescribe10();
224+
_Optimizer = new OptimizerForDescribe10();
225+
_Preprocessor = new PreprocessorForDescribe10();
226226
break;
227227
}
228228

@@ -259,25 +259,25 @@ public DescribeCompiler(
259259
switch (DEFAULT_GRAMMAR)
260260
{
261261
case GrammarName.Basic:
262-
Optimizer = new OptimizerForDescribe06();
263-
Preprocessor = new PreprocessorForDescribe06();
262+
_Optimizer = new OptimizerForDescribe06();
263+
_Preprocessor = new PreprocessorForDescribe06();
264264
break;
265265
case GrammarName.Tags:
266-
Optimizer = new OptimizerForDescribe07();
267-
Preprocessor = new PreprocessorForDescribe07();
266+
_Optimizer = new OptimizerForDescribe07();
267+
_Preprocessor = new PreprocessorForDescribe07();
268268
break;
269269
case GrammarName.Links:
270-
Optimizer = new OptimizerForDescribe08();
271-
Preprocessor = new PreprocessorForDescribe08();
270+
_Optimizer = new OptimizerForDescribe08();
271+
_Preprocessor = new PreprocessorForDescribe08();
272272
break;
273273
case GrammarName.Decorators:
274-
Optimizer = new OptimizerForDescribe09();
275-
Preprocessor = new PreprocessorForDescribe09();
274+
_Optimizer = new OptimizerForDescribe09();
275+
_Preprocessor = new PreprocessorForDescribe09();
276276
break;
277277
case GrammarName.Official:
278278
default:
279-
Optimizer = new DefaultOptimizer();
280-
Preprocessor = new PreprocessorForDescribe10();
279+
_Optimizer = new OptimizerForDescribe10();
280+
_Preprocessor = new PreprocessorForDescribe10();
281281
break;
282282
}
283283

‎@DescribeCompilerAPI/Compiler/Compiler/Settings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public partial class DescribeCompiler
3636
/// <summary>
3737
/// A string representing the full name of the compiler (with the version)
3838
/// </summary>
39-
public static string COMPILER_NAME = "Describe Compiler v0.9.2";
39+
public static string COMPILER_NAME = "Describe Compiler v0.9.3";
4040

4141
/// <summary>
4242
/// A string representing the compiler version
4343
/// </summary>
44-
public static string COMPILER_VER = "0.9.2";
44+
public static string COMPILER_VER = "0.9.3";
4545
}
4646
}

‎@DescribeCompilerAPI/Compiler/Compiler/VerbosityHigh.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ bool ParseFile_HighVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
110110
try
111111
{
112112
source = File.ReadAllText(fileInfo.FullName);
113-
source = Preprocessor.ProcessSource(source);
113+
source = _Preprocessor.ProcessSource(source);
114114
if (source.Length == 0)
115115
{
116116
LogError("Error - the file you are trying to parse is empty");
@@ -167,7 +167,7 @@ bool ParseFile_HighVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
167167
//unfold
168168
try
169169
{
170-
bool optimized = Optimizer.DoScripture(unfold, root);
170+
bool optimized = _Optimizer.DoScripture(unfold, root);
171171
if (optimized)
172172
{
173173
LogText("Parse tree unfolded successfuly");
@@ -217,7 +217,7 @@ bool parseFile_HighVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
217217
try
218218
{
219219
source = File.ReadAllText(fileInfo.FullName);
220-
source = Preprocessor.ProcessSource(source);
220+
source = _Preprocessor.ProcessSource(source);
221221
if (source.Length == 0)
222222
{
223223
LogError("Error - the file you are trying to parse is empty");
@@ -274,7 +274,7 @@ bool parseFile_HighVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
274274
//unfold
275275
try
276276
{
277-
bool optimized = Optimizer.DoScripture(unfold, root);
277+
bool optimized = _Optimizer.DoScripture(unfold, root);
278278
if (optimized)
279279
{
280280
LogText("Parse tree unfolded successfuly");

‎@DescribeCompilerAPI/Compiler/Compiler/VerbosityLow.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ bool ParseFile_LowVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
107107
try
108108
{
109109
source = File.ReadAllText(fileInfo.FullName);
110-
source = Preprocessor.ProcessSource(source);
110+
source = _Preprocessor.ProcessSource(source);
111111
if (source.Length == 0)
112112
{
113113
msg += "file is empty!";
@@ -156,7 +156,7 @@ bool ParseFile_LowVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
156156
//unfold
157157
try
158158
{
159-
bool optimized = Optimizer.DoScripture(unfold, root);
159+
bool optimized = _Optimizer.DoScripture(unfold, root);
160160
if (!optimized)
161161
{
162162
msg += "failed to unfold tree.";
@@ -201,7 +201,7 @@ private bool parseFile_LowVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
201201
try
202202
{
203203
source = File.ReadAllText(fileInfo.FullName);
204-
source = Preprocessor.ProcessSource(source);
204+
source = _Preprocessor.ProcessSource(source);
205205
if (source.Length == 0)
206206
{
207207
msg += "file is empty!";
@@ -250,7 +250,7 @@ private bool parseFile_LowVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
250250
//unfold
251251
try
252252
{
253-
bool optimized = Optimizer.DoScripture(unfold, root);
253+
bool optimized = _Optimizer.DoScripture(unfold, root);
254254
if (optimized)
255255
{
256256
msg += "Ok";

‎@DescribeCompilerAPI/Compiler/Compiler/VerbosityMedium.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ bool ParseFile_MediumVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
109109
try
110110
{
111111
source = File.ReadAllText(fileInfo.FullName);
112-
source = Preprocessor.ProcessSource(source);
112+
source = _Preprocessor.ProcessSource(source);
113113
if (source.Length == 0)
114114
{
115115
LogError("Error - the file you are trying to parse is empty");
@@ -164,7 +164,7 @@ bool ParseFile_MediumVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
164164
//unfold
165165
try
166166
{
167-
bool optimized = Optimizer.DoScripture(unfold, root);
167+
bool optimized = _Optimizer.DoScripture(unfold, root);
168168
if (optimized)
169169
{
170170
LogText("Parse tree unfolded successfuly");
@@ -216,7 +216,7 @@ bool parseFile_MediumVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
216216
try
217217
{
218218
source = File.ReadAllText(fileInfo.FullName);
219-
source = Preprocessor.ProcessSource(source);
219+
source = _Preprocessor.ProcessSource(source);
220220
if (source.Length == 0)
221221
{
222222
LogError("Error - the file you are trying to parse is empty");
@@ -271,7 +271,7 @@ bool parseFile_MediumVerbosity(FileInfo fileInfo, DescribeUnfold unfold)
271271
//unfold
272272
try
273273
{
274-
bool optimized = Optimizer.DoScripture(unfold, root);
274+
bool optimized = _Optimizer.DoScripture(unfold, root);
275275
if (optimized)
276276
{
277277
LogText("Parse tree unfolded successfuly");

0 commit comments

Comments
 (0)