生成コードテスト用ツールの作成とCIへの組み込み

.gitignore

@@ -31,3 +31,5 @@ go_dump_env.bat
 license_cache
 pkg/
 stats.json
+zig-cache/
+zig-out/

.vscode/settings.json

@@ -148,6 +148,7 @@
         ".\\ast2rust\\Cargo.toml",
         ".\\src\\tool\\json2rust\\Cargo.toml",
         ".\\src\\tool\\json2llvm\\Cargo.toml",
+        ".\\testutil\\Cargo.toml",
     ],
     "brgen-lsp.src2json" :"./tool/src2json.exe",
     //"go.buildTags": "linux",

ast2go/request/response.go

@@ -7,8 +7,22 @@ type RequestStream struct {
 	w io.Writer
 }
 
-func NewRequestStream(r io.Reader, w io.Writer) *RequestStream {
-	return &RequestStream{r: r, w: w}
+func NewRequestStream(r io.Reader, w io.Writer) (*RequestStream, error) {
+	h := &RequestStream{r: r, w: w}
+	if err := h.handshake(); err != nil {
+		return nil, err
+	}
+	return h, nil
+}
+
+func (rs *RequestStream) handshake() error {
+	resp := &GeneratorResponseHeader{Version: 1}
+	enc := resp.MustEncode()
+	if _, err := rs.w.Write(enc); err != nil {
+		return err
+	}
+	hdr := &GeneratorRequestHeader{}
+	return hdr.Read(rs.r)
 }
 
 func (rs *RequestStream) Receive() (*GenerateSource, error) {
@@ -20,11 +34,37 @@ func (rs *RequestStream) Receive() (*GenerateSource, error) {
 	return src, nil
 }
 
-func (rs *RequestStream) Respond(src *SourceCode) error {
-	enc, err := src.Encode()
-	if err != nil {
-		return err
+func (rs *RequestStream) respond(id uint64, status ResponseStatus, name string, code []byte, warn string) error {
+	src := &SourceCode{
+		ID:     id,
+		Status: status,
+	}
+	src.SetName([]byte(name))
+	src.SetCode(code)
+	src.SetErrorMessage([]byte(warn))
+	resp := &Response{
+		Type: ResponseType_Code,
+	}
+	resp.SetSource(*src)
+	enc := resp.MustEncode()
+	_, err := rs.w.Write(enc)
+	return err
+}
+
+func (rs *RequestStream) RespondSource(id uint64, name string, code []byte, warn string) error {
+	return rs.respond(id, ResponseStatus_Ok, name, code, warn)
+}
+
+func (rs *RequestStream) RespondError(id uint64, err string) error {
+	return rs.respond(id, ResponseStatus_Error, "", nil, err)
+}
+
+func (rs *RequestStream) RespondEnd(id uint64) error {
+	resp := &Response{
+		Type: ResponseType_EndOfCode,
 	}
-	_, err = rs.w.Write(enc)
+	resp.SetEnd(EndOfCode{ID: id})
+	enc := resp.MustEncode()
+	_, err := rs.w.Write(enc)
 	return err
 }

brgen.json

@@ -53,7 +53,7 @@
       "args": ["-as-code-block", "-format"]
     },
     {
-      "generator": "./src/tool/json2rust/target/debug/json2rust",
+      "generator": "./tool/json2rust",
       "output_dir": "./ignore/example/rust/",
       "ignore_missing": true
     },

build.bat

@@ -1,6 +1,7 @@
 @echo off
 setlocal
 set S2J_LIB=1
+set BRGEN_RUST_ENABLED=1
 set BUILD_MODE=%1
 set BUILD_TYPE=%2
 set FUTILS_DIR=%3
@@ -41,10 +42,10 @@ rem ninja -C ./built/%BUILD_MODE%/%BUILD_TYPE%
 ninja -C ./built/%BUILD_MODE%/%BUILD_TYPE% install
 
 if "%BUILD_MODE%" == "wasm-em" (
-    cd ./src/tool/json2rust
-    wasm-pack build --target web
-    copy ..\..\..\LICENSE .\pkg\LICENSE
-    cd ../../../
+rem    cd ./src/tool/json2rust
+rem    wasm-pack build --target web
+rem    copy ..\..\..\LICENSE .\pkg\LICENSE
+rem    cd ../../../
     cd ./web/dev
     call tsc
     call webpack

build.sh

@@ -4,6 +4,8 @@ if [ "$(uname)" != "Darwin" ]; then
    export S2J_LIB=1
 fi
 
+export BRGEN_RUST_ENABLED=1
+
 BUILD_MODE=$1
 BUILD_TYPE=$2
 
@@ -48,16 +50,16 @@ if [ $BUILD_MODE = "wasm-em" ];then
 else
    cmake  -D CMAKE_CXX_COMPILER=$CXX_COMPILER -D CMAKE_C_COMPILER=$C_COMPILER -G Ninja -D CMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -D CMAKE_BUILD_TYPE=$BUILD_TYPE -S . -B ./built/$BUILD_MODE/$BUILD_TYPE
 fi
-ninja -C ./built/$BUILD_MODE/$BUILD_TYPE
+#ninja -C ./built/$BUILD_MODE/$BUILD_TYPE
 ninja -C ./built/$BUILD_MODE/$BUILD_TYPE install
 
 if [ $BUILD_MODE = "wasm-em" ]; then
 unset GOOS
 unset GOARCH
-cd ./src/tool/json2rust
-wasm-pack build --target web
-cp ../../../LICENSE ./pkg
-cd ../../..
+#cd ./src/tool/json2rust
+#wasm-pack build --target web
+#cp ../../../LICENSE ./pkg
+#cd ../../..
 cd ./web/dev
 tsc
 webpack
@@ -68,3 +70,4 @@ fi
 unset FUTILS_DIR
 unset BUILD_MODE
 unset S2J_LIB
+unset BRGEN_RUST_ENABLED

spec/brgen_genrated_mapping_schema.json

@@ -0,0 +1,62 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "description": "brgen(BinaRy encoder/decoder GENerator driver) generated file information",
+  "properties": {
+    "structs": {
+      "type": "array",
+      "description": "List of structs",
+      "item": {
+        "type": "string",
+        "description": "Struct name"
+      }
+    },
+    "line_map": {
+      "type": "array",
+      "description": "Line number mappings",
+      "item": {
+        "type": "object",
+        "description": "Line number mapping",
+        "item": {
+          "line": {
+            "type": "integer",
+            "description": "Line number of generated file"
+          },
+          "loc": {
+            "type": "object",
+            "description": "Location of source file",
+            "item": {
+              "file": {
+                "type": "integer",
+                "description": "File index"
+              },
+              "line": {
+                "type": "integer",
+                "description": "Line number of source file"
+              },
+              "col": {
+                "type": "integer",
+                "description": "Column number of source file"
+              },
+              "pos": {
+                "type": "object",
+                "description": "Position of source file",
+                "item": {
+                  "begin": {
+                    "type": "integer",
+                    "description": "Begin position of source file"
+                  },
+                  "end": {
+                    "type": "integer",
+                    "description": "End position of source file"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "additionalProperties": false
+}

spec/brgen_json_schema.json

@@ -24,7 +24,7 @@
     },
     "test_info_output": {
       "type": "string",
-      "description": "Path to the test info output file (default: no output)"
+      "description": "Path to the test info output file (default: no output). schema is defined in brgen_test_info_schema.json"
     },
     "warnings": {
       "type": "object",

spec/brgen_test_info_schema.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "description": "brgen(BinaRy encoder/decoder GENerator driver) output information file schema",
+  "properties": {
+    "total_count": {
+      "type": "integer",
+      "description": "Total count of output files"
+    },
+    "error_count": {
+      "type": "integer",
+      "description": "Count of output files with errors"
+    },
+    "time": {
+      "type": "string",
+      "description": "Time taken to generate output files"
+    },
+    "generated_files": {
+      "type": "array",
+      "description": "List of generated output files",
+      "items": {
+        "type": "object",
+        "properties": {
+          "dir": {
+            "type": "string",
+            "description": "Directory containing the output file"
+          },
+          "base": {
+            "type": "string",
+            "description": "Output file name without extension"
+          },
+          "suffix": {
+            "type": "string",
+            "description": "Output file extension"
+          }
+        }
+      }
+    }
+  },
+  "additionalProperties": false
+}