Merge pull request #13 from hugheaves/openscad-grammar-updates

Openscad grammar updates

.github/workflows/release-build.yml

@@ -47,12 +47,8 @@ jobs:
         java-version: '17'
     - name: Install ANTLR
       run: pip install antlr4-tools
-    - name: Generate
-      run: go generate ./...
-    - name: Test
-      run: go test -v ./...
-    - name: Build
-      run: go build -o scadformat.exe cmd/main.go
+    - name: Build and Test
+      run: make
     - name: Zip Artifact
       run: powershell Compress-Archive scadformat.exe windows.zip
     - name: Upload Artifact
@@ -81,12 +77,8 @@ jobs:
         java-version: '17'
     - name: Install ANTLR
       run: pip install antlr4-tools
-    - name: Generate
-      run: go generate ./...
-    - name: Test
-      run: go test -v ./...
-    - name: Build
-      run: go build -o scadformat cmd/main.go
+    - name: Build and Test
+      run: make
     - name: Zip Artifact
       run: zip macos.zip scadformat
     - name: Upload Artifact
@@ -115,12 +107,8 @@ jobs:
         java-version: '17'
     - name: Install ANTLR
       run: pip install antlr4-tools
-    - name: Generate
-      run: go generate ./...
-    - name: Test
-      run: go test -v ./...
-    - name: Build
-      run: go build -o scadformat cmd/main.go
+    - name: Build and Test
+      run: make
     - name: Zip Artifact
       run: zip linux.zip scadformat
     - name: Upload Artifact

.github/workflows/test-build.yml

@@ -23,11 +23,5 @@ jobs:
     - name: Install ANTLR
       run: pip install antlr4-tools
 
-    - name: Generate
-      run: go generate ./...
-
-    - name: Test
-      run: go test -v ./...
-
-    - name: Build
-      run: go build -o scadformat cmd/main.go
+    - name: Build and Test
+      run: make

.gitignore

@@ -1,12 +1,5 @@
-/scadformat
-/internal/parser/.antlr
-/internal/parser/openscad_base_visitor.go
-/internal/parser/openscad_lexer.go
-/internal/parser/openscad_parser.go
-/internal/parser/openscad_visitor.go
-/internal/parser/openscad_base_visitor.go.orig
-/internal/parser/OpenSCAD.interp
-/internal/parser/OpenSCAD.tokens
-/internal/parser/OpenSCADLexer.interp
-/internal/parser/OpenSCADLexer.tokens
+/internal/parser/*
 /cmd/version.txt
+/.antlr
+/scadformat
+/scadformat.exe

Makefile

@@ -0,0 +1,15 @@
+scadformat: test cmd/*.go internal/parser/*.go internal/formatter/*.go internal/logutil/*.go
+	go build cmd/scadformat.go
+
+internal/parser/*.go: OpenSCAD.g4
+	go generate ./...
+
+test: internal/parser/*.go
+	go test ./...
+
+clean:
+	rm -f internal/parser/*
+	rm -rf internal/parser/.antlr
+	rm cmd/version.txt
+
+.PHONY: clean test