Skip to content

Commit f48c571

Browse files
committed
Added <IF STRUCTURE_DISPLAY_FIELD>
1 parent b9ced3b commit f48c571

5 files changed

Lines changed: 32 additions & 15 deletions

File tree

CodeGenEngine/ExpressionEvaluators/ExpressionEvaluatorStructure.dbl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ namespace CodeGen.Engine
6767
structureExpressionEvaluators.Add("FILE_STATIC_RFA", evaluateFileStaticRfa)
6868
structureExpressionEvaluators.Add("FILE_STORED_GRFA", evaluateFileStoredGrfa)
6969
structureExpressionEvaluators.Add("FILE_TERABYTE", evaluateFileTerabyte)
70+
structureExpressionEvaluators.Add("STRUCTURE_DISPLAY_FIELD", evaluateStructureDisplayField)
7071
structureExpressionEvaluators.Add("STRUCTURE_KEYS", evaluateStructureKeys)
7172
structureExpressionEvaluators.Add("STRUCTURE_LDESC", evaluateStructureLongDesc)
7273
endmethod
@@ -150,6 +151,16 @@ namespace CodeGen.Engine
150151
mreturn evaluateStructureExpression(tkn, template, loops, doEvaluate)
151152
endmethod
152153

154+
private static method evaluateStructureDisplayField, boolean
155+
tkn, @Token
156+
template, @FileNode
157+
loops, @IEnumerable<LoopNode>
158+
endparams
159+
proc
160+
lambda doEvaluate(str) (!String.IsNullOrWhiteSpace(str.DisplayField))
161+
mreturn evaluateStructureExpression(tkn, template, loops, doEvaluate)
162+
endmethod
163+
153164
private static method evaluateStructureKeys, boolean
154165
tkn, @Token
155166
template, @FileNode

CodeGenEngine/Tokenizer.dbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,7 @@ namespace CodeGen.Engine
10081008
expressions.Add("STRUCTFIELD", TokenValidity.FieldLoop | TokenValidity.KeySegmentLoop | TokenValidity.RelationSegmentLoop)
10091009
expressions.Add("STRUCTURE", TokenValidity.ParameterLoop)
10101010
expressions.Add("STRUCTURE_ASCII", TokenValidity.Anywhere)
1011+
expressions.Add("STRUCTURE_DISPLAY_FIELD", TokenValidity.Anywhere)
10111012
expressions.Add("STRUCTURE_FILES", TokenValidity.Anywhere)
10121013
expressions.Add("STRUCTURE_HAS_UNIQUE_KEY", TokenValidity.Anywhere)
10131014
expressions.Add("STRUCTURE_HAS_UNIQUE_PK", TokenValidity.Anywhere)

Documentation/CodeGen.chm

780 Bytes
Binary file not shown.

Documentation/CodeGen.hsm

2.33 KB
Binary file not shown.

Documentation/Release Procedure.txt

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,50 +9,55 @@ This document defines the procedure for distributing a new release of CodeGen on
99

1010
3. Build new HTML help and Web help files.
1111

12-
4. Commit but DO NOT PUSH the documentation change to GitHub with a comment of "Updated documentation in preparation for X.Y.Z release."
12+
4. Commit AND PUSH the Windows help file to GitHub with a comment of "Updated help file in preparation for X.Y.Z release."
1313

1414
5. Build everything in RELEASE mode.
1515

16-
6. Build and a new installation.
16+
6. Build a new local (unsigned) installer.
1717

1818
7. Install the new version from the local MSI and run as many tests as possible.
1919

2020
8. Uninstall the locally built (unsigned) version.
2121

22-
9. Push the "Updatad documentation" commit to GitHub - this will fire the CICD pipeline.
22+
9. Push the "Updatad documentation" commit to GitHub.
2323

24-
10. Verify that the CICD pipeline completes without errors or warnings.
24+
10. Run the Azure DevOps CICD pipeline and verify that it completes successfully.
25+
(https://synergexdev.visualstudio.com/Development/_build?definitionId=149)
2526

26-
11. Download the signed installer to the release history folder.
27+
11. Download the signed installer and place it in the release history folder.
28+
29+
12. Install the signed version locally.
2730

2831
12. Do the release on GitHub.
2932

30-
13. Upload web help files to the web site.
33+
13. Commit AND PUSH the web help files in the "docs" folder with a comment of "Updated web help for X.Y.Z release.".
3134

3235
14. Bump the version number in CurrentRelease.xml
3336

34-
15. Commit BUT DO NOT PUSH the changes to CurrentRelease.xml to GitHub with a comment of "Announced version X.Y.Z to check for update."
37+
15. Commit AND PUSH the changes to CurrentRelease.xml to GitHub with a comment of "Announced version X.Y.Z to check for update."
3538

3639
--------------------------------------------------------------------------------
3740
PREPARE TRUNK FOR NEXT VERSION
3841

39-
1. Edit CodeGenEngine\codegen.def and bump the version number.
42+
1. Edit azure-pipelines.yml and bump the version number.
43+
44+
2. Edit CodeGenEngine\codegen.def and bump the version number.
4045

41-
2. Edit CodeGenSetup\product.wxs
46+
3. Edit CodeGenSetup\product.wxs
4247
- Bump the product version number string
4348
- Generate and implement a new product id GUID (DO NOT change the UpgradeCode GUID)
4449

45-
3. Edit Project Properties for the CodeGenSetup project and change the version number in the Output Name field.
50+
4. Edit Project Properties for the CodeGenSetup project and change the version number in the Output Name field.
4651

47-
4. Create a new folder under releases and record the new GUID in a text file.
52+
5. Create a new folder under releases and record the new GUID in a text file.
4853

49-
5. Use the SetAssemblyFileVersion utility to bump the version number in all AssemblyInfo files.
54+
6. Use the SetAssemblyFileVersion utility to bump the version number in all AssemblyInfo files.
5055

51-
6. Edit azure-pipelines.yml and change the version number in the currentVersion property.
56+
7. Edit azure-pipelines.yml and change the version number in the currentVersion property.
5257

53-
7. Add a new section to the Release notes section of the documentation and build a new HTML help file.
58+
8. Add a new section to the Release notes section of the documentation and build a new HTML help file.
5459

55-
8. Commit and push to GitHub the version number changes with a comment of "Bumped version to X.Y.Z for next release.".
60+
9. Commit AND PUSH to GitHub the version number changes with a comment of "Bumped version to X.Y.Z for next release.".
5661

5762
--------------------------------------------------------------------------------
5863
UPDATE GITHUB ISSUES

0 commit comments

Comments
 (0)