Skip to content

Commit 3d357e1

Browse files
author
Steve Ives
committed
Merge branch 'master' of https://github.com/Synergex/CodeGen 
2 parents 7c83dee + 12853ab commit 3d357e1

File tree

161 files changed

+181
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+181
-164
lines changed

‎CodeConverter/CodeConverter/Properties/AssemblyInfo.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ import System.Runtime.InteropServices
3030
; Revision
3131
;
3232
{assembly: AssemblyVersion("1.0.0.0")}
33-
{assembly: AssemblyFileVersion("5.8.8.0")}
33+
{assembly: AssemblyFileVersion("5.8.9.0")}

‎CodeConverter/CodeConverterInterface/Properties/AssemblyInfo.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ import System.Runtime.InteropServices
3030
; Revision
3131
;
3232
{assembly: AssemblyVersion("1.0.0.0")}
33-
{assembly: AssemblyFileVersion("5.8.8.0")}
33+
{assembly: AssemblyFileVersion("5.8.9.0")}

‎CodeGen/Properties/AssemblyInfo.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ import System.Runtime.InteropServices
3030
; Revision
3131
;
3232
{assembly: AssemblyVersion("1.0.0.0")}
33-
{assembly: AssemblyFileVersion("5.8.8.0")}
33+
{assembly: AssemblyFileVersion("5.8.9.0")}
3434

‎CodeGenEngine/CodeGenerator.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,7 @@ namespace CodeGen.Engine
19361936

19371937
;;-------------------------------------------------------------------------
19381938
;;Report any tweaks that are enabled
1939-
if (!errStatus && context.CurrentTask.Tweaks.Count > 0 && context.DebugLoggingEnabled)
1939+
if (!errStatus && context.CurrentTask.Tweaks != ^null && context.CurrentTask.Tweaks.Count > 0 && context.DebugLoggingEnabled)
19401940
begin
19411941
context.CurrentTask.Log("The following TWEAKS are enabled:",true,false)
19421942
data tweak, string

‎CodeGenEngine/ExpressionEvaluators/ExpressionEvaluator.dbl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,12 @@ namespace CodeGen.Engine
180180

181181
;;TWEAK_
182182
else if (expression.Value.Value.StartsWith("TWEAK_")) then
183-
mreturn template.Context.CurrentTask.Tweaks.Contains(expression.Value.Value.Replace("TWEAK_",""))
183+
begin
184+
if (template.Context.CurrentTask.Tweaks != ^null) then
185+
mreturn template.Context.CurrentTask.Tweaks.Contains(expression.Value.Value.Replace("TWEAK_",""))
186+
else
187+
mreturn false
188+
end
184189

185190
;;COUNTER_
186191
else if ((expression.Value.Value.StartsWith("COUNTER_1_")

‎CodeGenEngine/Properties/AssemblyInfo.dbl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import System.Runtime.InteropServices
3030
; Revision
3131
;
3232
{assembly: AssemblyVersion("1.0.0.0")}
33-
{assembly: AssemblyFileVersion("5.8.8.0")}
33+
{assembly: AssemblyFileVersion("5.8.9.0")}
3434

3535

3636

‎CodeGenEngine/TokenExpanders/TokenExpanderInterfaceLoop.dbl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,15 @@ namespace CodeGen.Engine
127127
begin
128128
if ((tkn.Value) == "INTERFACE_NAME"
129129
& && tkn.Modifier == TokenModifier.None
130-
& && template.Context.CurrentTask.Tweaks.Contains("SMC_CAMEL_CASE")) then
130+
& && template.Context.CurrentTask.Tweaks != ^null
131+
& && template.Context.CurrentTask.Tweaks.Contains("SMC_CAMEL_CASE")) then
131132
begin
132133
tkn.Modifier = TokenModifier.CamelCase
133134
mreturn currentInterface.Name.ToUpper()
134135
end
135136
else if ((tkn.Value) == "INTERFACE_NAME"
136137
& && tkn.Modifier == TokenModifier.None
138+
& && template.Context.CurrentTask.Tweaks != ^null
137139
& && template.Context.CurrentTask.Tweaks.Contains("SMC_PASCAL_CASE")) then
138140
begin
139141
tkn.Modifier = TokenModifier.PascalCase

‎CodeGenEngine/TokenExpanders/TokenExpanderMethodLoop.dbl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,15 @@ namespace CodeGen.Engine
241241
begin
242242
if ((tkn.Value) == "METHOD_NAME"
243243
& && tkn.Modifier == TokenModifier.None
244+
& && template.Context.CurrentTask.Tweaks != ^null
244245
& && template.Context.CurrentTask.Tweaks.Contains("SMC_CAMEL_CASE")) then
245246
begin
246247
tkn.Modifier = TokenModifier.CamelCase
247248
mreturn meth.Name.ToUpper()
248249
end
249250
else if ((tkn.Value) == "METHOD_NAME"
250251
& && tkn.Modifier == TokenModifier.None
252+
& && template.Context.CurrentTask.Tweaks != ^null
251253
& && template.Context.CurrentTask.Tweaks.Contains("SMC_PASCAL_CASE")) then
252254
begin
253255
tkn.Modifier = TokenModifier.PascalCase

‎CodeGenEngine/TokenExpanders/TokenExpanderParameterLoop.dbl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,15 @@ namespace CodeGen.Engine
236236
begin
237237
if ((tkn.Value) == "PARAMETER_NAME"
238238
& && tkn.Modifier == TokenModifier.None
239+
& && template.Context.CurrentTask.Tweaks != ^null
239240
& && template.Context.CurrentTask.Tweaks.Contains("SMC_CAMEL_CASE")) then
240241
begin
241242
tkn.Modifier = TokenModifier.CamelCase
242243
mreturn param.Name.ToUpper()
243244
end
244245
else if ((tkn.Value) == "PARAMETER_NAME"
245246
& && tkn.Modifier == TokenModifier.None
247+
& && template.Context.CurrentTask.Tweaks != ^null
246248
& && template.Context.CurrentTask.Tweaks.Contains("SMC_PASCAL_CASE")) then
247249
begin
248250
tkn.Modifier = TokenModifier.PascalCase

‎CodeGenEngine/codegen.def‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
.ifndef CODEGEN_VERSION
4444

45-
.define CODEGEN_VERSION "V5.8.8"
45+
.define CODEGEN_VERSION "V5.8.9"
4646
.define CODEGEN_BUFSZ 32768
4747

4848
.endc

0 commit comments

Comments
 (0)