diff options
author | Ralph Amissah <ralph.amissah@gmail.com> | 2021-10-23 19:49:43 -0400 |
---|---|---|
committer | Ralph Amissah <ralph.amissah@gmail.com> | 2021-11-27 19:51:25 -0500 |
commit | c4f6c86999ec8fe3b610ac269a121c9fa424daf5 (patch) | |
tree | 9251611c030c29af99bfa59bda94521c3500ad94 /src | |
parent | nix .envrc related (diff) |
dlang dub & nix build related, includes dep update
- nix-shell --pure
- nix-build
- dub build --compiler=ldc2 --build=release --force
Diffstat (limited to 'src')
-rw-r--r-- | src/ext_depends/D-YAML.meta | 2 | ||||
-rw-r--r-- | src/ext_depends/D-YAML/.github/workflows/d.yml | 73 | ||||
-rw-r--r-- | src/ext_depends/D-YAML/docs/logo.svg | 147 | ||||
-rw-r--r-- | src/ext_depends/D-YAML/meson.build | 2 | ||||
-rw-r--r-- | src/ext_depends/D-YAML/source/dyaml/emitter.d | 2 | ||||
-rw-r--r-- | src/ext_depends/D-YAML/source/dyaml/representer.d | 2 |
6 files changed, 224 insertions, 4 deletions
diff --git a/src/ext_depends/D-YAML.meta b/src/ext_depends/D-YAML.meta index acad016..2f596f2 100644 --- a/src/ext_depends/D-YAML.meta +++ b/src/ext_depends/D-YAML.meta @@ -1,3 +1,3 @@ -D-YAML ff5ec445 +D-YAML a6805551 https://github.com/dlang-community/D-YAML Boost Software License 1.0 (BSL-1.0) diff --git a/src/ext_depends/D-YAML/.github/workflows/d.yml b/src/ext_depends/D-YAML/.github/workflows/d.yml new file mode 100644 index 0000000..08f583f --- /dev/null +++ b/src/ext_depends/D-YAML/.github/workflows/d.yml @@ -0,0 +1,73 @@ +name: D + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + strategy: + matrix: + dc: + - dmd-latest + - ldc-latest + - dmd-beta + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: ${{ matrix.dc }} + - name: 'Test' + run: | + dub test --build=unittest-cov + bash <(curl -s https://codecov.io/bash) + examples: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: dmd-latest + - name: 'Build Examples' + run: | + dub build dyaml:benchmark + dub build dyaml:constructor + dub build dyaml:getting-started + dub build dyaml:representer + dub build dyaml:resolver + dub build dyaml:testsuite + dub build dyaml:tojson + dub build dyaml:yaml_gen + dub build dyaml:yaml_stats + ninja: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: dmd-latest + - name: 'Install dependencies' + run: | + sudo apt-get install python3-pip python3-setuptools python3-wheel ninja-build + sudo pip3 install meson + - name: 'Build' + run: | + export PATH=$PATH:$PWD/.ntmp + meson build && ninja -j8 -C build + ninja -j8 -C build test -v + yaml-test-suite: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: dmd-latest + - name: 'Run YAML test suite' + run: | + git clone https://github.com/yaml/yaml-test-suite + dub run dyaml:testsuite diff --git a/src/ext_depends/D-YAML/docs/logo.svg b/src/ext_depends/D-YAML/docs/logo.svg new file mode 100644 index 0000000..0683284 --- /dev/null +++ b/src/ext_depends/D-YAML/docs/logo.svg @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="72.081085mm" + height="23.683783mm" + viewBox="0 0 72.081085 23.683783" + version="1.1" + id="svg5" + inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" + sodipodi:docname="logo.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview7" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="false" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="3.1090604" + inkscape:cx="96.170536" + inkscape:cy="-1.7690232" + inkscape:window-width="1920" + inkscape:window-height="1037" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer3" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:snap-intersection-paths="false" + inkscape:object-paths="false" + inkscape:snap-smooth-nodes="false" + inkscape:snap-others="true" + inkscape:snap-text-baseline="false" + inkscape:snap-bbox="false" /> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Background" + style="display:inline;opacity:1"> + <rect + id="rect27931" + width="69.767754" + height="21.35491" + x="1.1663953" + y="1.1795517" + style="fill:#a02010;fill-opacity:1;stroke:#800000;stroke-width:2.31061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" + ry="2.0646694" /> + </g> + <g + inkscape:groupmode="layer" + id="layer1" + inkscape:label="Redraw" + style="display:inline"> + <path + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3.3596127,11.588522 -0.00167,1.215397 h 3.7208859 v -1.216451 z" + id="path366" /> + <path + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 7.9491328,11.587597 -0.00167,1.215397 h 3.7208852 v -1.216451 z" + id="path366-3" /> + <path + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 12.542085,11.587383 -0.0017,1.215397 h 3.720885 v -1.216451 z" + id="path366-3-6" /> + <path + style="fill:none;fill-opacity:1;stroke:#ffaaaa;stroke-width:1.50865;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 18.208542,6.5772319 0.0019,9.9235361 2.984365,-0.0015 c 2.257131,-0.0011 4.028957,-1.841084 4.028957,-4.960275 0,-3.7743035 -1.988594,-4.95213 -4.148338,-4.95213 z" + id="path1429" + sodipodi:nodetypes="ccsscc" /> + <rect + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.08054;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" + id="rect33186" + width="1.318697" + height="1.4490472" + x="27.402775" + y="9.7524118" + ry="0.63109142" /> + <rect + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.08054;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" + id="rect33186-7" + width="1.318697" + height="1.4490472" + x="27.399069" + y="14.282472" + ry="0.63109142" /> + <rect + style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.08054;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" + id="rect33186-7-5" + width="1.2367439" + height="1.3484181" + x="62.078617" + y="14.800523" + ry="0.56990385" /> + <path + style="fill:#faf5f4;fill-opacity:1;stroke:#faf5f4;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 29.435146,7.01655 1.188715,-7.54e-4 2.762109,3.95981 2.761828,-3.9591246 1.176365,-0.00139 -3.476821,4.8699456 5.08e-4,4.333336 -0.923882,0.0017 -3.04e-4,-4.321608 z" + id="path33522" + sodipodi:nodetypes="cccccccccc" /> + <path + style="fill:#faf5f4;fill-opacity:1;stroke:#faf5f4;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 35.645065,16.219087 1.003538,2.79e-4 0.990773,-2.511287 4.076129,-6e-6 0.990177,2.511131 1.003729,0.0014 -4.025414,-9.821757 z" + id="path63310" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:#a02010;fill-opacity:1;stroke:#a02010;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 38.020975,12.826118 3.312824,-1.75e-4 -1.649675,-4.1982801 z" + id="path64470" + sodipodi:nodetypes="cccc" /> + <path + style="fill:#faf5f4;fill-opacity:1;stroke:#faf5f4;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 44.015432,16.21915 0.952875,-2.51e-4 1.430776,-6.6010501 2.785926,7.1215661 2.772621,-7.1217129 1.445932,6.6015999 0.938289,0.0031 -2.13315,-9.7860055 -3.024245,7.8909655 -3.023596,-7.8922607 z" + id="path89584" + sodipodi:nodetypes="ccccccccccc" /> + <path + style="fill:#faf5f4;fill-opacity:1;stroke:#faf5f4;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 55.522331,7.0154589 0.0011,9.2051281 4.221809,-5.08e-4 v -0.92532 l -3.297426,0.0011 -3.04e-4,-8.2790775 z" + id="path102819" + sodipodi:nodetypes="ccccccc" /> + <rect + style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.08054;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" + id="rect33186-7-5-2" + width="1.2367439" + height="1.3484181" + x="64.755455" + y="14.799554" + ry="0.56990385" /> + <rect + style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.08054;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" + id="rect33186-7-5-9" + width="1.2367439" + height="1.3484181" + x="67.430305" + y="14.800311" + ry="0.56990385" /> + </g> +</svg> diff --git a/src/ext_depends/D-YAML/meson.build b/src/ext_depends/D-YAML/meson.build index 68d17c7..8a09d6a 100644 --- a/src/ext_depends/D-YAML/meson.build +++ b/src/ext_depends/D-YAML/meson.build @@ -1,7 +1,7 @@ project('D-YAML', 'd', meson_version: '>=0.40.0', subproject_dir: 'contrib', - version: '0.8.0' + version: '0.8.4' ) project_soversion = '0' diff --git a/src/ext_depends/D-YAML/source/dyaml/emitter.d b/src/ext_depends/D-YAML/source/dyaml/emitter.d index c797eb9..a436c7c 100644 --- a/src/ext_depends/D-YAML/source/dyaml/emitter.d +++ b/src/ext_depends/D-YAML/source/dyaml/emitter.d @@ -906,7 +906,7 @@ struct Emitter(Range, CharType) if (isOutputRange!(Range, CharType)) { string tagString = tag; - if(tagString == "!"){return tagString;} + if (tagString == "!") return "!"; string handle; string suffix = tagString; diff --git a/src/ext_depends/D-YAML/source/dyaml/representer.d b/src/ext_depends/D-YAML/source/dyaml/representer.d index a7ca802..98c825b 100644 --- a/src/ext_depends/D-YAML/source/dyaml/representer.d +++ b/src/ext_depends/D-YAML/source/dyaml/representer.d @@ -142,7 +142,7 @@ Node representData(const Node data, ScalarStyle defaultScalarStyle, CollectionSt { // Float comparison is pretty unreliable... auto result = representData(Node(1.0), ScalarStyle.invalid, CollectionStyle.invalid); - assert(approxEqual(result.as!string.to!real, 1.0)); + assert(isClose(result.as!string.to!real, 1.0)); assert(result.tag == "tag:yaml.org,2002:float"); assert(representData(Node(real.nan), ScalarStyle.invalid, CollectionStyle.invalid) == Node(".nan", "tag:yaml.org,2002:float")); |