Merge pull request #368 from on-keyday/gen/fix-wasm-src2json

Gen/fix wasm src2json

Author: on-keyday

.github/workflows/codeql.yml

@@ -10,18 +10,15 @@
 # supported CodeQL languages.
 #
 name: "CodeQL"
-
 on:
   push:
     branches: ["main"]
   pull_request:
     branches: ["main"]
   schedule:
     - cron: "21 18 * * 0"
-
 permissions:
   contents: read
-
 jobs:
   analyze:
     name: Analyze
@@ -35,24 +32,21 @@ jobs:
     permissions:
       # required for all workflows
       security-events: write
-
       # only required for workflows in private repositories
       actions: read
       contents: read
-
     strategy:
       fail-fast: false
       matrix:
-        language: ["c-cpp", "go"]
+        language: ["c-cpp", "go", "actions"]
         # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
         # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
         # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
+        timeout-minutes: 5
       # Initializes the CodeQL tools for scanning.
 
       # If you wish to specify custom queries, you can do so here or in a config file.
@@ -75,30 +69,36 @@ jobs:
       #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
       - name: Set up Ninja
         uses: seanmiddleditch/gha-setup-ninja@7e868db0f3406270dd46e1dac26c65f621456723 # master
+        if: matrix.language != 'c-cpp'
+        timeout-minutes: 5
       - name: Set up Clang
         uses: egor-tensin/setup-clang@8092a31dc33b0c41ee7cc5bb81fd0267490a0161 # v2.2
         if: matrix.language == 'c-cpp'
+        timeout-minutes: 5
         with:
           version: latest
           platform: x64
       - name: Install libc++-dev and libc++abi-dev
+        timeout-minutes: 5
         run: sudo apt-get install libc++-dev libc++abi-dev -y
       - name: Initialize CodeQL
         uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        timeout-minutes: 5
         with:
           languages: ${{ matrix.language }}
           debug: true
       - name: Build C++ and Go
         if: matrix.language == 'c-cpp' || matrix.language == 'go'
+        timeout-minutes: 5
         run: |
           env | grep -E "CODEQL|LD_PRELOAD|CC|CXX"
           export FUTILS_CXX_COMPILER=$CXX
           export FUTILS_C_COMPILER=$CC
           ldd $(which clang)
           FUTILS_DIR=./utils python build.py native
           ./tool/src2json --version
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        timeout-minutes: 5
         with:
           category: "/language:${{matrix.language}}"

.harness-worktrees/b2993c56fd9620106c99858da64455f8

@@ -178,8 +178,8 @@
       "name": "Debug ebm2cpp",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceRoot}/rebrgen/tool/ebmgen",
-      "args": ["-i", "${workspaceRoot}/rebrgen/save/stream.bgn"],
+      "program": "${workspaceRoot}/rebrgen/tool/ebm2c",
+      "args": ["-i", "${workspaceRoot}/rebrgen/save/wasm.ebm"],
       "stopAtEntry": false,
       "cwd": "${workspaceRoot}/rebrgen",
       "environment": [],

.vscode/launch.json

@@ -466,6 +466,7 @@ struct ast2c_RawScope {
 	size_t ident_size;
 	void* owner;
 	int branch_root;
+	ast2c_Loc loc;
 };
 
 struct ast2c_RawNode {
@@ -1520,6 +1521,7 @@ struct ast2c_Scope {
 	size_t ident_size;
 	ast2c_Node* owner;
 	int branch_root;
+	ast2c_Loc loc;
 };
 
 // returns 1 if succeed 0 if failed

astlib/ast2c/ast.h

@@ -860,6 +860,7 @@ public class Scope {
 	public List<Ident>? Ident{get;set;}
 	public Node? Owner{get;set;}
 	public bool BranchRoot{get;set;}
+	public Loc Loc{get;set;}
 }
 public struct Pos {
 	public ulong Begin{get;set;}
@@ -883,6 +884,7 @@ public class RawScope {
 	public List<ulong>? Ident{get;set;}
 	public ulong? Owner{get;set;}
 	public bool BranchRoot{get;set;}
+	public Loc Loc{get;set;}
 }
 public class RawNode {
 	public NodeType NodeType{get;set;}

astlib/ast2csharp/ast.cs

@@ -997,6 +997,7 @@ class Scope {
     List<Ident>? ident = [];
     Node? owner;
     bool branchRoot = false;
+    Loc loc = Loc();
 factory Scope.fromJson(Map<String, dynamic> json) => _$ScopeFromJson(json);
 }
 @JsonSerializable()
@@ -1028,6 +1029,7 @@ class RawScope {
     List<int> ident = [];
     int? owner;
     bool branchRoot = false;
+    Loc loc = Loc();
 factory RawScope.fromJson(Map<String, dynamic> json) => _$RawScopeFromJson(json);
 }
 @JsonSerializable()

astlib/ast2dart/lib/ast.dart

@@ -729,6 +729,7 @@ class Scope:
     ident: List[Ident]
     owner: Optional[Node]
     branch_root: bool
+    loc: Loc
 
 
 class Pos:
@@ -780,6 +781,7 @@ class RawScope:
     ident: List[int]
     owner: Optional[int]
     branch_root: bool
+    loc: Loc
 
 def parse_RawScope(json: dict) -> RawScope:
     ret = RawScope()
@@ -801,6 +803,7 @@ def parse_RawScope(json: dict) -> RawScope:
     else:
         ret.owner = None
     ret.branch_root = bool(json["branch_root"])
+    ret.loc = parse_Loc(json["loc"])
     return ret
 
 
@@ -2371,6 +2374,7 @@ def ast2node(ast :JsonAst) -> Program:
         if ast.scope[i].owner is not None:
             scope[i].owner = ast.node[ast.scope[i].owner]
         scope[i].branch_root = ast.scope[i].branch_root
+        scope[i].loc = ast.scope[i].loc
     return node[0]
 
 def walk(node: Node, f: Callable[[Callable,Node],None]) -> None:

astlib/ast2go/ast/ast.go

@@ -9507,6 +9507,7 @@ pub struct Scope {
 	pub ident: Vec<Weak<RefCell<Ident>>>,
 	pub owner: Option<NodeWeak>,
 	pub branch_root: bool,
+	pub loc: Loc,
 }
 
 #[derive(Debug,Clone,Copy,Serialize,Deserialize)]
@@ -9538,6 +9539,7 @@ pub struct RawScope {
 	pub ident: Vec<usize>,
 	pub owner: Option<usize>,
 	pub branch_root: bool,
+	pub loc: Loc,
 }
 
 #[derive(Debug,Clone,Serialize,Deserialize)]
@@ -10325,6 +10327,7 @@ pub fn parse_ast(ast:JsonAst)->Result<Rc<RefCell<Program>> ,Error>{
 			ident: Vec::new(),
 			owner: None,
 			branch_root: false,
+			loc: Loc{ pos: Pos{ begin: 0, end: 0 }, file: 0, line: 0, col: 0 },
 		}));
 		scopes.push(scope);
 	}
@@ -15900,6 +15903,8 @@ pub fn parse_ast(ast:JsonAst)->Result<Rc<RefCell<Program>> ,Error>{
 			};
 			scope.borrow_mut().ident.push(Rc::downgrade(ident));
 		}
+		scope.borrow_mut().branch_root = raw_scope.branch_root;
+		scope.borrow_mut().loc = raw_scope.loc;
 	}
 
 	match nodes.get(0){