[PATCH 094/188] added parsing of table (without elements)

From aeb69f66c429c5ac82d725301e2ea0fad453cac7 Mon Sep 17 00:00:00 2001
From: Dmitry Boyarintsev <[email protected]>
Date: Mon, 16 Mar 2020 15:38:25 -0400

git-svn-id: branches/wasm@46090 -

utils/wasmbin/wasmmodule.pas

@@ -130,6 +130,19 @@ type
     function AddFunc: TWasmFunc;
   end;
 
+  { TWasmId }
+
+  TWasmId = record
+    idNum : integer;
+    id    : string;
+  end;
+
+  { TWasmTable }
+
+  TWasmTable = class(TObject)
+    id    : TWasmId;
+  end;
+
   { TWasmModule }
 
   TWasmModule = class(TObject)
@@ -138,10 +151,15 @@ type
     types   : TList;
     funcs   : TList;
     exp     : TList;
+    tables  : TList;
   public
     constructor Create;
     destructor Destroy; override;
 
+    function AddTable: TWasmTable;
+    function GetTable(i: integer): TWasmTable;
+    function TableCount: Integer;
+
     function AddImport: TWasmImport;
     function GetImport(i: integer): TWasmImport;
     function ImportCount: Integer;
@@ -401,10 +419,13 @@ begin
   funcs := TList.Create;
   exp := TList.Create;
   imports := TList.Create;
+  tables := TList.Create;
 end;
 
 destructor TWasmModule.Destroy;
 begin
+  ClearList(tables);
+  tables.Free;
   ClearList(imports);
   imports.Free;
   ClearList(exp);
@@ -416,6 +437,25 @@ begin
   inherited Destroy;
 end;
 
+function TWasmModule.AddTable: TWasmTable;
+begin
+  Result:=TWasmTable.Create;
+  tables.Add(Result);
+end;
+
+function TWasmModule.GetTable(i: integer): TWasmTable;
+begin
+  if (i>=0) and (i<tables.Count) then
+    Result:=TWasmTable(tables[i])
+  else
+    Result:=nil;
+end;
+
+function TWasmModule.TableCount: Integer;
+begin
+  Result:=tables.Count;
+end;
+
 function TWasmModule.AddImport: TWasmImport;
 begin
   Result:=TWasmImport.Create;

utils/wasmbin/watparser.pas

@@ -348,6 +348,29 @@ begin
   sc.Next;
 end;
 
+function ParseId(sc: TWatScanner; var id: TWasmId): boolean;
+begin
+  if sc.token = weNumber then begin
+    id.idNum := sc.resInt32;
+    id.id := '';
+    Result := true;
+  end else if sc.token = weIdent then begin
+    id.id := sc.resText;
+    id.idNum := -1;
+    Result := true;
+  end else
+    Result := false;
+  if Result then sc.Next;
+end;
+
+procedure ParseTable(sc: TWatScanner; dst: TWasmTable);
+begin
+  sc.Next;
+  ParseId(sc, dst.id);
+  ConsumeToken(sc, weFuncRef);
+  ConsumeToken(sc, weCloseBrace);
+end;
+
 procedure ParseModuleInt(sc: TWatScanner; dst: TWasmModule);
 var
   tk      : TWatToken;
@@ -372,6 +395,9 @@ begin
           ParseImport(sc, imp);
           symlist.Clear;
         end;
+        weTable: begin
+          ParseTable(sc, dst.AddTable)
+        end;
         weFunc: begin
           f:=dst.AddFunc;
           symlist.ToLinkInfo(f.LinkInfo);