Skip to content

Commit 86bbc8f

Browse files
committed
Added two new field loop expansion tokens <FIELD_ENUMBASEVAL> and <FIELD_ENUMSTEPVAL>.
1 parent ce72ddd commit 86bbc8f

6 files changed

Lines changed: 26 additions & 2 deletions

File tree

CodeConverter/CodeConverter/CodeConverter.synproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4040
<IncludeDebugInformation>true</IncludeDebugInformation>
4141
<OutputPath>$(SolutionDir)Bin\Release\</OutputPath>
42-
<PlatformTarget>x86</PlatformTarget>
42+
<PlatformTarget>AnyCPU</PlatformTarget>
4343
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
4444
<DebugOptimize>Optimize</DebugOptimize>
4545
<DocumentationFile>$(SolutionDir)Bin\Release\CodeConverter.xml</DocumentationFile>

CodeGenEngine/TokenExpanders/TokenExpanderFieldLoop.dbl

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ namespace CodeGen.Engine
8484
fieldLoopTokenExpanders.Add("FIELD_DRILLM", expandFieldDrillMethod)
8585
fieldLoopTokenExpanders.Add("FIELD_ELEMENT", expandFieldElement)
8686
fieldLoopTokenExpanders.Add("FIELD_ELEMENT0", expandFieldElement0)
87+
fieldLoopTokenExpanders.Add("FIELD_ENUMBASEVAL", expandFieldEnumBaseVal)
8788
fieldLoopTokenExpanders.Add("FIELD_ENUMLENGTH", expandFieldEnumLength)
89+
fieldLoopTokenExpanders.Add("FIELD_ENUMSTEPVAL", expandFieldEnumStepVal)
8890
fieldLoopTokenExpanders.Add("FIELD_ENUMWIDTH", expandFieldEnumWidth)
8991
fieldLoopTokenExpanders.Add("FIELD_FORMATNAME", expandFieldFormatName)
9092
fieldLoopTokenExpanders.Add("FIELD_FORMATSTRING", expandFieldFormatString)
@@ -530,6 +532,16 @@ namespace CodeGen.Engine
530532
mreturn ExpandFieldLoopToken(tkn, template, loops, doExpand)
531533
endmethod
532534

535+
private static method expandFieldEnumBaseVal, string
536+
tkn, @Token
537+
template, @FileNode
538+
loops, @IEnumerable<LoopNode>
539+
endparams
540+
proc
541+
lambda doExpand(str, field) Convert.ToString(field.EnumeratedBaseValue)
542+
mreturn ExpandFieldLoopToken(tkn, template, loops, doExpand)
543+
endmethod
544+
533545
private static method expandFieldEnumLength, string
534546
tkn, @Token
535547
template, @FileNode
@@ -540,6 +552,16 @@ namespace CodeGen.Engine
540552
mreturn ExpandFieldLoopToken(tkn, template, loops, doExpand)
541553
endmethod
542554

555+
private static method expandFieldEnumStepVal, string
556+
tkn, @Token
557+
template, @FileNode
558+
loops, @IEnumerable<LoopNode>
559+
endparams
560+
proc
561+
lambda doExpand(str, field) Convert.ToString(field.EnumeratedStepValue)
562+
mreturn ExpandFieldLoopToken(tkn, template, loops, doExpand)
563+
endmethod
564+
543565
private static method expandFieldEnumWidth, string
544566
tkn, @Token
545567
template, @FileNode

CodeGenEngine/Tokenizer.dbl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,9 @@ namespace CodeGen.Engine
310310
& { new TokenMeta() {Name = "FIELD_DRILL_PIXEL_COL", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
311311
& { new TokenMeta() {Name = "FIELD_ELEMENT", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
312312
& { new TokenMeta() {Name = "FIELD_ELEMENT0", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
313+
& { new TokenMeta() {Name = "FIELD_ENUMBASEVAL", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
313314
& { new TokenMeta() {Name = "FIELD_ENUMLENGTH", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
315+
& { new TokenMeta() {Name = "FIELD_ENUMSTEPVAL", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
314316
& { new TokenMeta() {Name = "FIELD_ENUMWIDTH", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
315317
& { new TokenMeta() {Name = "FIELD_FORMATNAME", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
316318
& { new TokenMeta() {Name = "FIELD_FORMATSTRING", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },

CodeGenSetup/CodeGenSetup.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</ItemGroup>
166166
<Import Project="$(WixTargetsPath)" />
167167
<PropertyGroup>
168-
<PostBuildEvent>$(SolutionDir)SignFile.bat $(SolutionDir)Bin\$(Configuration)\CodeGen.msi</PostBuildEvent>
168+
<PostBuildEvent />
169169
</PropertyGroup>
170170
<!--
171171
To modify your build process, add your task inside one of the targets below and uncomment it.

Documentation/CodeGen.chm

1.49 KB
Binary file not shown.

Documentation/CodeGen.hsm

13.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)