Skip to content

Commit 805a216

Browse files
committed
Added a new field loop expansion token <FIELD_DBL_NET_CONVERTER>.
1 parent 2e61636 commit 805a216

File tree

8 files changed

+325
-3
lines changed

8 files changed

+325
-3
lines changed

CodeGen.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleTemplates", "SampleTe
4242
SampleTemplates\DatabaseTableConnection.tpl = SampleTemplates\DatabaseTableConnection.tpl
4343
SampleTemplates\DatabaseTableMapped.tpl = SampleTemplates\DatabaseTableMapped.tpl
4444
SampleTemplates\DatabaseTableTest.tpl = SampleTemplates\DatabaseTableTest.tpl
45+
SampleTemplates\DblNetConverter.dbl = SampleTemplates\DblNetConverter.dbl
4546
SampleTemplates\DecimalToMDYString.dbl = SampleTemplates\DecimalToMDYString.dbl
4647
SampleTemplates\DecimalToTimeString.dbl = SampleTemplates\DecimalToTimeString.dbl
4748
SampleTemplates\IsDate.dbl = SampleTemplates\IsDate.dbl

CodeGenEngine/TokenExpanders/TokenExpanderFieldLoop.dbl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ namespace CodeGen.Engine
7676
fieldLoopTokenExpanders.Add("FIELD_CUSTOM_SQL_TYPE", expandFieldCustomSqlType)
7777
fieldLoopTokenExpanders.Add("FIELD_CUSTOM_CONVERT_FUNCTION", expandFieldCustomConvertFunction)
7878
fieldLoopTokenExpanders.Add("FIELD_CUSTOM_STRING_FUNCTION", expandFieldCustomStringFunction)
79+
fieldLoopTokenExpanders.Add("FIELD_DBL_NET_CONVERTER", expandFieldDblNetConverterer)
7980
fieldLoopTokenExpanders.Add("FIELD_DEFAULT", expandFieldDefault)
8081
fieldLoopTokenExpanders.Add("FIELD_DESC", expandFieldDescription)
8182
fieldLoopTokenExpanders.Add("FIELD_DESC_DOUBLE", expandFieldDescriptionDouble)
@@ -482,6 +483,16 @@ namespace CodeGen.Engine
482483
mreturn ExpandFieldLoopToken(tkn, template, loops, doExpand)
483484
endmethod
484485

486+
private static method expandFieldDblNetConverterer, string
487+
tkn, @Token
488+
template, @FileNode
489+
loops, @IEnumerable<LoopNode>
490+
endparams
491+
proc
492+
lambda doExpand(str, field) field.DblNetConverterer
493+
mreturn ExpandFieldLoopToken(tkn, template, loops, doExpand)
494+
endmethod
495+
485496
private static method expandFieldDefault, string
486497
tkn, @Token
487498
template, @FileNode

CodeGenEngine/Tokenizer.dbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ namespace CodeGen.Engine
313313
& { new TokenMeta() {Name = "FIELD_CUSTOM_SQL_TYPE", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
314314
& { new TokenMeta() {Name = "FIELD_CUSTOM_CONVERT_FUNCTION", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
315315
& { new TokenMeta() {Name = "FIELD_CUSTOM_STRING_FUNCTION", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
316+
& { new TokenMeta() {Name = "FIELD_DBL_NET_CONVERTER", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
316317
& { new TokenMeta() {Name = "FIELD_DEFAULT", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
317318
& { new TokenMeta() {Name = "FIELD_DESC", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },
318319
& { new TokenMeta() {Name = "FIELD_DESC_DOUBLE", TypeOfToken = TokenType.FieldLoop, IsPaired = false, Validity = TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop, RequiresRepository = true} },

CodeGenSetup/Product.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,9 @@
703703
<Component Id="CanOpenFile.dbl" Guid="{B4B035DD-11AD-4FDD-9B5A-B5767E89F5A1}">
704704
<File Id="CanOpenFile.dbl" KeyPath="yes" Source="..\SampleTemplates\CanOpenFile.dbl" />
705705
</Component>
706+
<Component Id="DblNetConverter.dbl" Guid="{B42AB98F-AF10-4DFE-94AA-3E17D251A3C2}">
707+
<File Id="DblNetConverter.dbl" KeyPath="yes" Source="..\SampleTemplates\DblNetConverter.dbl" />
708+
</Component>
706709
<Component Id="DecimalToMDYString.dbl" Guid="{7CB9A496-9DB2-4965-9383-CF4CBAC28DDD}">
707710
<File Id="DecimalToMDYString.dbl" KeyPath="yes" Source="..\SampleTemplates\DecimalToMDYString.dbl" />
708711
</Component>
@@ -946,6 +949,7 @@
946949

947950
<ComponentRef Id="CamelCase.dbl" />
948951
<ComponentRef Id="CanOpenFile.dbl" />
952+
<ComponentRef Id="DblNetConverter.dbl" />
949953
<ComponentRef Id="DecimalToMDYString.dbl" />
950954
<ComponentRef Id="DecimalToTimeString.dbl" />
951955
<ComponentRef Id="IsDate.dbl" />

Documentation/CodeGen.chm

2.47 KB
Binary file not shown.

Documentation/CodeGen.hsmx

1.95 KB
Binary file not shown.

0 commit comments

Comments
 (0)