Add more complex comments (#30)

* generator: added more complex comment parsing. * Updated dependencies
abice · Feb 14, 2019 · 835e766 · 835e766
1 parent 67c9f0e
commit 835e766
Show file tree

Hide file tree

Showing 699 changed files with 1,086 additions and 167,487 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,59 +1,38 @@
 version: 2
+
+
+common_parts: &common_parts
+  working_directory: /go/src/github.com/abice/go-enum
+  steps:
+    - checkout
+    - run:
+        name: Install Go Deps
+        command: |
+          go get -v github.com/jteeuwen/go-bindata/... golang.org/x/tools/cmd/cover github.com/mattn/goveralls github.com/modocache/gover github.com/golang/mock/gomock
+          go install github.com/golang/mock/mockgen
+    - run:
+        name: Build
+        command: |
+          make build
+    - run:
+        name: Test
+        command: |
+          make cover
+
+
 jobs:
   golang_1.9:
-    working_directory: /go/src/github.com/abice/go-enum
+    <<: *common_parts
     docker:
       - image: circleci/golang:1.9
-    steps:
-      - checkout
-      - run: &installgodeps
-          name: Install Go Deps
-          command: |
-            go get -v github.com/jteeuwen/go-bindata/...
-            go get -v golang.org/x/tools/cmd/cover
-            go get -v github.com/mattn/goveralls
-            go get -v github.com/modocache/gover
-            go get -v github.com/golang/mock/gomock
-            go install github.com/golang/mock/mockgen
-      - run:
-          name: Build
-          command: |
-            make build
-      - run:
-          name: Test
-          command: |
-            make cover
   golang_1.10:
-    working_directory: /go/src/github.com/abice/go-enum
     docker:
       - image: circleci/golang:1.10
-    steps:
-      - checkout
-      - run: *installgodeps
-      - run:
-          name: Build
-          command: |
-            make build
-      - run:
-          name: Test
-          command: |
-            make cover
+    <<: *common_parts
   golang_1.11:
-    working_directory: /go/src/github.com/abice/go-enum
     docker:
       - image: circleci/golang:1.11
-    steps:
-      - checkout
-      - run: *installgodeps
-      - run:
-          name: Build
-          command: |
-            make build
-      - run:
-          name: Test
-          command: |
-            make cover
-            make coveralls
+    <<: *common_parts
 
 workflows:
   version: 2

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -37,4 +37,4 @@ required = ["github.com/golang/mock/gomock"]
 
 [[constraint]]
   name = "github.com/golang/mock"
-  version = "1.1.1"
+  version = "1.2.0"
diff --git a/example/commented.go b/example/commented.go
@@ -11,3 +11,14 @@ value3 // Commented value 3
 )
 */
 type Commented int
+
+// ComplexCommented has some extra complicated parsing rules.
+/*
+ENUM(
+	_, // Placeholder with a ','  in it. (for harder testing)
+value1 // Commented value 1
+value2,
+value3 // Commented value 3
+)
+*/
+type ComplexCommented int
diff --git a/example/commented_enum.go b/example/commented_enum.go
diff --git a/example/sql_mock_test.go b/example/sql_mock_test.go