Merge pull request #326 from veelo/ci-dip1000

Test DIP 1000
dlang-community · Feb 28, 2023 · d5d27f0 · d5d27f0
2 parents 3dedcd4 + 7b9d8c1
commit d5d27f0
Show file tree

Hide file tree

Showing 30 changed files with 85 additions and 20 deletions.
diff --git a/.github/workflows/d.yaml b/.github/workflows/d.yaml
@@ -2,8 +2,8 @@ name: Run all D Tests
 on: [push, pull_request]
 
 jobs:
-  test:
-    name: Dub Tests
+  unittest:
+    name: Pegged unit tests
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
@@ -27,3 +27,26 @@ jobs:
 
       - name: Run tests
         run: dub -q test
+
+  examples:
+    name: Examples unit tests
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        dc: [dmd-2.101.2] # Avoid https://dlang.org/changelog/2.102.0.html#build-cache
+        example: [arithmetic, csv, json, numbers, python, simple_arithmetic, strings, xml]
+        exclude:
+          # out of memory
+          - { example: python }
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install D compiler
+        uses: dlang-community/setup-dlang@v1
+        with:
+          compiler: ${{ matrix.dc }}
+
+      - name: Test example
+        run: dub test :${{ matrix.example }}
diff --git a/dub.json b/dub.json
@@ -30,9 +30,13 @@
     ],
     "subPackages": [
       "examples/arithmetic",
+      "examples/composition",
+      "examples/csv",
+      "examples/json",
       "examples/numbers",
+      "examples/python",
+      "examples/simple_arithmetic",
       "examples/strings",
-      "examples/csv",
-      "examples/json"
+      "examples/xml"
     ]
 }
diff --git a/examples/PEG/dub.json b/examples/PEG/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/arithmetic/dub.json b/examples/arithmetic/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/arithmetic/src/pegged/examples/arithmetic.d b/examples/arithmetic/src/pegged/examples/arithmetic.d
@@ -8,6 +8,8 @@ import std.conv: to;
 
 import pegged.grammar;
 
+@safe:
+
 mixin(grammar(`
 # Arithmetic grammar with variable terminal
 Arithmetic:

diff --git a/examples/c/dub.json b/examples/c/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/composition/dub.json b/examples/composition/dub.json
@@ -16,5 +16,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/composition/src/pegged/examples/composition.d b/examples/composition/src/pegged/examples/composition.d
@@ -6,6 +6,8 @@ module pegged.examples.composition;
 import pegged.grammar;
 import pegged.examples.strings, pegged.examples.numbers;
 
+@safe:
+
 mixin(grammar(`
 LOG:
     LogFile <- LogLine+ eoi

diff --git a/examples/csv/dub.json b/examples/csv/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/csv/src/pegged/examples/csv.d b/examples/csv/src/pegged/examples/csv.d
@@ -7,6 +7,8 @@ version(unittest)
     import std.stdio;
 }
 
+@safe:
+
 mixin(grammar(`
 CSV:
 

diff --git a/examples/dgrammar/dub.json b/examples/dgrammar/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/extended_pascal/dub.json b/examples/extended_pascal/dub.json
@@ -9,6 +9,7 @@
             "path": "../.."
         }
     },
+    "dflags": [ "-preview=dip1000" ],
     "preGenerateCommands": [
         "rdmd -I$PEGGED_PACKAGE_DIR source/make.d"
     ],

diff --git a/examples/json/dub.json b/examples/json/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/json/src/pegged/examples/json.d b/examples/json/src/pegged/examples/json.d
@@ -2,6 +2,8 @@ module pegged.examples.json;
 
 import pegged.grammar;
 
+@safe:
+
 mixin(grammar(`
 JSON:
     JSONObject <  :'{' (Pair (:',' Pair)*)? :'}'

diff --git a/examples/markdown/dub.json b/examples/markdown/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/misc/dub.json b/examples/misc/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/numbers/dub.json b/examples/numbers/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/numbers/src/pegged/examples/numbers.d b/examples/numbers/src/pegged/examples/numbers.d
@@ -5,6 +5,8 @@ module pegged.examples.numbers;
 
 import pegged.grammar;
 
+@safe:
+
 /// Numbers
 mixin(grammar(`
 Numbers:

diff --git a/examples/oberon2/dub.json b/examples/oberon2/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/parameterized/dub.json b/examples/parameterized/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/peggedgrammar/dub.json b/examples/peggedgrammar/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/python/dub.json b/examples/python/dub.json
@@ -9,6 +9,7 @@
       "path": "../.."
     }
   },
+  "dflags": [ "-preview=dip1000" ],
   "dflags-dmd": [  "-lowmem" ],
   "dflags-ldc": [ "--lowmem" ]
 }
diff --git a/examples/python/src/pegged/examples/python.d b/examples/python/src/pegged/examples/python.d
@@ -3,6 +3,8 @@ module pegged.examples.python;
 
 import pegged.grammar;
 
+@safe:
+
 // https://docs.python.org/3/reference/grammar.html
 // 3.10.3 Documentation » The Python Language Reference » 10. Full Grammar specification
 enum string pythonGrammar = `

diff --git a/examples/simple_arithmetic/dub.json b/examples/simple_arithmetic/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/simple_arithmetic/src/pegged/examples/simple_arithmetic.d b/examples/simple_arithmetic/src/pegged/examples/simple_arithmetic.d
@@ -8,6 +8,8 @@ import std.conv: to;
 
 import pegged.grammar;
 
+@safe:
+
 mixin(grammar(`
 Arithmetic:
     Term     < Factor (Add / Sub)*

diff --git a/examples/strings/dub.json b/examples/strings/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/strings/src/pegged/examples/strings.d b/examples/strings/src/pegged/examples/strings.d
@@ -2,6 +2,8 @@ module pegged.examples.strings;
 
 import pegged.grammar;
 
+@safe:
+
 mixin(grammar(`
 String:
 # Example of a rule for double-quoted strings

diff --git a/examples/xml/dub.json b/examples/xml/dub.json
@@ -8,5 +8,6 @@
       "version": "*",
       "path": "../.."
     }
-  }
+  },
+  "dflags": [ "-preview=dip1000" ]
 }
diff --git a/examples/xml/src/pegged/examples/xml.d b/examples/xml/src/pegged/examples/xml.d
@@ -7,6 +7,8 @@ import pegged.grammar;
 
 import std.array;
 
+@safe:
+
 string[] nameStack;
 
 /// Semantic action to push a tag name on a stack

diff --git a/examples/xml/src/pegged/examples/xml2.d b/examples/xml/src/pegged/examples/xml2.d
@@ -2,6 +2,8 @@ module pegged.examples.xml2;
 
 import pegged.grammar;
 
+@safe:
+
 enum XMLgrammar = `
 XML:
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ version(unittest) @@
         import std.stdio;
     }
+    @safe:
     mixin(grammar(`
     CSV:
@@ Expand Down @@