Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge generator scripts for WRC and NetFramework #520

Merged
merged 7 commits into from
Oct 15, 2018
Merged

Merge generator scripts for WRC and NetFramework #520

merged 7 commits into from
Oct 15, 2018

Conversation

angularsen
Copy link
Owner

@angularsen angularsen commented Oct 14, 2018 •
edited
Loading

Merge #517 first.

I initially started out to see if I could easily create separate code generation scripts for WRC, but I quickly realized there is a lot in common and keeping both sets of scripts in sync on common code would be a big hassle. However, I think I found a nice middleground that improves on the current state.

Instead of using partial classes to share common code between WRC and NetFramework, we can instead handle WRC special cases in code generator scripts. This removes a bunch of #if sections and merges the "Common" partial code back into each of the WRC and NetFramework files so it is in one place and easy to read.

  • Merge quantity code from Common partial files back into WRC/NetFramework specific code
  • Handle WRC special cases in code generator script
  • Arrange (huge) quantity code into #regions, easier to navigate
  • Move code generation script into functions, easier to read
  • Add Types.psm1 with types for intellisense on parsed JSON*
  • Require PowerShell 5.1 (ships with Win10, needed for classes)
  • VS and VSCode struggle with intellisense when importing types with 'using module', this is relatively new and will probably improve later.

@angularsen angularsen added this to the 4.0 milestone Oct 14, 2018
@angularsen
Copy link
Owner Author

Not quite ready to merge, still fixing WRC compile errors.

@angularsen
generate-code.bat: Set workdir to scripts folder
fa88e53 
Needed for 'using module' in powershell to work, it can't have variables.
@angularsen
Merge generator scripts for WRC and NetFramework
e0a1ca1 
Handle WRC special cases in code generator scripts instead of in generated code.
This removes all the #if sections and merges the "Common" partial code back into
each of the WRC and NetFramework files so it is in one place and easy to read.

- Arrange huge quantity code into #regions, easier to navigate
- Move code generation into functions, easier to read
- Add Types.psm1 with types for intellisense on parsed JSON*
- Require PowerShell 5.1 (for classes)

* VS and VSCode struggle with intellisense when importing types with
'using module', this is relatively new and will probably improve later.
@angularsen
Remove generated common code for quantities
a88da65
@angularsen
Regen
03af845
@angularsen
Fix WRC compile errors
00d46d3 
Fix build warns about xmldoc
@angularsen
Copy link
Owner Author

angularsen commented Oct 14, 2018 •
edited
Loading

Rebased and regenerated with only "representative" quantities, removing 170ish files from diff. Also pulled in some commits into v4 directly that fixed concurrency issues with tests.
When this PR is merged, future PRs will have way smaller diffs reduced from 80 common +3 wrc +3 netfx files to only the 6 wrc/netfx files.

@angularsen angularsen mentioned this pull request Oct 15, 2018
Merged
@tmilnthorp tmilnthorp merged commit c5c6e51 into v4 Oct 15, 2018
@angularsen angularsen deleted the v4-merge-generator-scripts branch October 15, 2018 15:26
@angularsen angularsen mentioned this pull request Oct 15, 2018
Closed
angularsen added a commit that referenced this pull request Nov 4, 2018
@angularsen
Merged origin/v4 into release/v4
540963a 
Squashed commit of the following:

commit 875ca71
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Sun Nov 4 10:22:19 2018 +0100

    UnitsNet: 4.0.0-alpha5

commit a05a86e
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Sat Nov 3 07:08:51 2018 -0400

    Removing unit conversion from ToString methods. ToUnit must be called… (#546)

    * Removing unit conversion from ToString methods. ToUnit must be called first. ToString now has a single responsibility of converting to quantity into a string representation.

    * WRC fix

commit 9c43523
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Fri Nov 2 10:25:44 2018 -0400

    Merge remote-tracking branch 'angularsen/master' into v4

commit 30363ce
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Fri Nov 2 14:57:35 2018 +0100

    Delete Vector2/3

commit 799bfcc
Merge: b27ab41 29cbadf
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Wed Oct 31 11:20:50 2018 -0400

    Merge remote-tracking branch 'angularsen/master' into v4

commit 29cbadf
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Wed Oct 31 00:06:00 2018 -0400

    Making Obsolete attribute message consistent across scripts (#544)

commit 28f0989
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Wed Oct 31 00:03:31 2018 -0400

    Fix for explicit AbbreviationsWithPrefixes not lining up with the pre… (#542)

    * Fix for explicit AbbreviationsWithPrefixes not lining up with the prefixes.

    * Abort build when AbbreviationsWithPrefixes mismatches prefixes count. Will remove incorrect json after testing failure on AppVeyor.

    * Build fails properly. Putting missing abbreviation back.

    * Fix for count output

commit 157b288
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Tue Oct 30 12:27:39 2018 -0400

    Fixing nasty bug in GetHashCode where two quantities with the same nu… (#541)

    * Fixing nasty bug in GetHashCode where two quantities with the same numerical value/unit pair returned the same hash code. Type needed in GetHashCode implementation to guarantee uniqueness.

    * Using cleanup

commit 0f4769d
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Mon Oct 29 17:08:16 2018 -0400

    Adding dyn/cm² and lbm/(in·s²) units for pressure (#534)

    * Adding dyn/cm² and lbm/(in·s²) units for pressure

    * Adding microbars (= 1 dyn/cm²)

commit db10372
Author: Tristan Milnthorp <tmilnthorp@gmail.com>
Date:   Mon Oct 29 16:54:59 2018 -0400

    Adding support for micro/milli newtons, as well as ounce force (#535)

    * Adding support for micro/milli newtons, as well as ounce force

    * Fix for plural name and abbreviations for ounce force.

commit b27ab41
Merge: 355f82f 40a551e
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Tue Oct 23 07:49:18 2018 +0200

    Merge pull request #531 from tmilnthorp/IQuantityTAdditions

    Adding additional functionality to IQuantity<UnitType>

commit 40a551e
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Mon Oct 22 17:00:57 2018 -0400

    Adding additional functionality to IQuantity<UnitType>

commit 355f82f
Merge: 4f50c03 49026b2
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Wed Oct 17 18:15:20 2018 +0200

    Merge pull request #529 from tmilnthorp/CodeCleanup

    Cleaning up some unused code and adding ValueTuple support to make un…

commit 4f50c03
Merge: 876f31f b2c0097
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Wed Oct 17 18:04:36 2018 +0200

    Merge pull request #528 from tmilnthorp/Dimensionless

    Dimensionless

commit 49026b2
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Wed Oct 17 11:55:11 2018 -0400

    Adding ValueTuple package to WRC

commit a3d0435
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Wed Oct 17 11:43:40 2018 -0400

    Cleaning up some unused code and adding ValueTuple support to make unit abbreviations a bit clearer

commit b2c0097
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Wed Oct 17 09:27:07 2018 -0400

    Add test

commit 8ca0738
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Wed Oct 17 09:24:08 2018 -0400

    Cleanup

commit a187b58
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Wed Oct 17 09:18:46 2018 -0400

    Adding doc and tests

commit f1afdd8
Merge: 5f625cb 876f31f
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Wed Oct 17 09:14:05 2018 -0400

    Merge branch 'v4' into Dimensionless

commit 876f31f
Merge: 98fce99 466f68a
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Tue Oct 16 22:48:16 2018 +0200

    Merge pull request #524 from tmilnthorp/SIUnitSystem

    Adds UnitSystem and SI base units.

commit 466f68a
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 16:31:32 2018 -0400

    Adding doc. Making tests cleaner. Small method name changes,

commit 98fce99
Merge: 1c02a3d 423ec39
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Tue Oct 16 21:33:56 2018 +0200

    Merge pull request #526 from tmilnthorp/PruneGeneratedTests

    Pruning generated tests

commit 5f625cb
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 15:13:58 2018 -0400

    Implementing dimensionless base dimension

commit 423ec39
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 14:56:26 2018 -0400

    Pruning generated tests

commit 53aafef
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 13:56:55 2018 -0400

    Better add test for != too, in case someone changes the != implementation

commit 812dcfb
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 13:54:35 2018 -0400

    Fix for equality operator when both left and right are null

commit 8fe2088
Merge: 0830706 1c02a3d
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 13:35:04 2018 -0400

    Merge remote-tracking branch 'angularsen/v4' into SIUnitSystem

commit 0830706
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 13:33:08 2018 -0400

    Adding base/derived check to BaseDimensions

commit 21d8459
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 12:55:50 2018 -0400

    Fixing BaseUnits to not throw exception for undefined units. The Length quantity for example has a BaseUnits where only Length would be set. Only a UnitSystem needs it all. Moving logic there.  Expanding UnitSystem tests and logic. Fixing WRC.

commit f3c90ed
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Tue Oct 16 10:49:18 2018 -0400

    Implementing IEquatable<BaseUnits> on BaseUnits, and adding some tests for BaseUnits. Adding some doc too.

commit 1c02a3d
Merge: 7cfca07 283c6b6
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Mon Oct 15 21:48:00 2018 +0200

    Merge pull request #523 Replace GetHashCode implementation to match library

    Replace GetHashCode implementation to match library. Fixing exception…

commit 7cfca07
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Mon Oct 15 21:42:06 2018 +0200

    Remove internal parse methods (#521)

    * Remove redundant internal parse methods

    ParseInternal and TryParseInternal methods are redundant
    since the same logic is already in QuantityParser.

    * Remove internal ParseUnit methods

    Same as for Parse methods. DRY it up.

    * QuantityParser: Parse using given abbreviations cache

    Replace delegates for external unit parsing code with UnitParser.

    * Add null checking and make Trim() more explicit

    Trimming inline deep in the code is not easy to spot.
    Make it explicit, just after null checking.
    Fixes test that assumed ArgNullException.

commit a110555
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Mon Oct 15 15:39:35 2018 -0400

    Adding BaseUnits class. Adding SI unit system.

commit 283c6b6
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Mon Oct 15 15:08:15 2018 -0400

    Prefer non-equal objects for this test :)

commit 17acea8
Author: Tristan Milnthorp <tristan.milnthorp@ansys.com>
Date:   Mon Oct 15 15:03:37 2018 -0400

    Replace GetHashCode implementation to match library. Fixing exceptions with null in methods/operators. Adding tests to validate.

commit c5c6e51
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Mon Oct 15 16:54:37 2018 +0200

    Merge generator scripts for WRC and NetFramework (#520)

    * Merge generator scripts for WRC and NetFramework

    Handle WRC special cases in code generator scripts instead of in generated code.
    This removes all the #if sections and merges the "Common" partial code back into
    each of the WRC and NetFramework files so it is in one place and easy to read.

    - Arrange huge quantity code into #regions, easier to navigate
    - Move code generation into functions, easier to read
    - Add Types.psm1 with types for intellisense on parsed JSON*
    - Require PowerShell 5.1 (for classes)

    * VS and VSCode struggle with intellisense when importing types with
    'using module', this is relatively new and will probably improve later.

    * Remove generated common code for quantities

    * generate-code.bat: Set workdir to scripts folder

    Needed for 'using module' in powershell to work, it can't have variables.

    * Regen

    * Fix WRC compile errors

    Fix build warns about xmldoc

    * Fix for code changes

commit 86b2efc
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Mon Oct 15 16:14:44 2018 +0200

    Stricter parsing (#516)

    * Add abbreviations ″ and ′ to inch and foot

    Found in the wiki

    * Rename to LengthTests.FeetInches.cs

    * Length: Add TryParseFeetInches() and ParseFeetInches()

    Since parsing is generally made more strict, this method adds back the special parsing
    to handle strings like: 1' 2"

    * QuantityParser: Make parsing more strict

    - Only parse the format "{value} {unit abbreviation}" where the spacing is optional
    - No longer support parsing multiple quantities like "1 ft 2 in", use Length.ParseFeetInches() for that
    - Move Trim() to inner-most level

    * Regen

    * Trim input in TryParseFeetInches()

commit 485d028
Merge: f914132 632d6af
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Sun Oct 14 23:10:30 2018 +0200

    Merge branch 'v4-fix-tests' into v4

commit 632d6af
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Sat Oct 13 18:39:24 2018 +0200

    UnitParser: Minor cleanup

commit be26999
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Sat Oct 13 17:17:45 2018 +0200

    Remove weird tests

commit 74e54cf
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Sat Oct 13 23:35:14 2018 +0200

    Use instance of UnitAbbrevationsCache in test

    It broke other tests depending on sequence of running tests.

commit f914132
Author: Andreas Gullberg Larsen <andreas.larsen84@gmail.com>
Date:   Sun Oct 14 22:38:17 2018 +0200

    Ignore generated code except Length, Information, Level (#517)

    Length is a well known quantity with 'double' value
    Information is a well known quantity with 'decimal' value
    Level is a well known quantity with logarithmic value
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmilnthorp tmilnthorp Awaiting requested review from tmilnthorp

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@angularsen @tmilnthorp