Merge branch 'main' of github.com:benson1029/go-slang into main

docs/docusaurus.config.ts

@@ -1,6 +1,8 @@
 import {themes as prismThemes} from 'prism-react-renderer';
 import type {Config} from '@docusaurus/types';
 import type * as Preset from '@docusaurus/preset-classic';
+import remarkMath from 'remark-math';
+import rehypeKatex from 'rehype-katex';
 
 const config: Config = {
   title: 'Go Interpreter Specification',
@@ -36,6 +38,8 @@ const config: Config = {
         docs: {
           routeBasePath: '/',
           sidebarPath: './sidebars.ts',
+          remarkPlugins: [remarkMath],
+          rehypePlugins: [rehypeKatex],
         },
         theme: {
           customCss: './src/css/custom.css',
@@ -82,6 +86,16 @@ const config: Config = {
     mermaid: true,
   },
   themes: ['@docusaurus/theme-mermaid'],
+
+  stylesheets: [
+    {
+      href: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/katex.min.css',
+      type: 'text/css',
+      integrity:
+        'sha384-odtC+0UGzzFL/6PNoE8rX/SPcQDXBJ+uRepguP4QkPCm2LBxH3FA3y+fKSiJ+AmM',
+      crossorigin: 'anonymous',
+    },
+  ],
 };
 
 export default config;

docs/package.json

@@ -30,7 +30,9 @@
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
     "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react-dom": "^18.0.0",
+    "rehype-katex": "^7.0.0",
+    "remark-math": "^6.0.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.1.1",

src/go/ece/loader/globalSort.ts

@@ -63,10 +63,15 @@ function sort_global_declarations(program: any, imports: any[], default_imports:
         if (stmt.tag === "struct-method" && ignore_structs) continue;
         if (stmt.tag === "struct") {
             for (let ref of stmt.fields) {
-                if (ref.type.tag === "struct-decl-type") {
-                    back_edges[get_name(stmt)].push(ref.type.name);
-                    edges[ref.type.name].push(get_name(stmt));
+                let dfs = (type: any) => {
+                    if (type.tag === "struct-decl-type") {
+                        back_edges[get_name(stmt)].push(type.name);
+                        edges[type.name].push(get_name(stmt));
+                    } else if (type.tag === "array-type") {
+                        dfs(type.type);
+                    }
                 }
+                dfs(ref.type);
             }
             continue;
         }
@@ -230,6 +235,14 @@ function sort_global_declarations(program: any, imports: any[], default_imports:
         }
         return 0;
     });
+
+    // Remove the METHOD. captures.
+    for (let stmt of program.body) {
+        if (stmt.tag === "struct") continue;
+        stmt.captures = stmt.captures.filter((ref: any) => {
+            return !ref.name.startsWith("METHOD.");
+        });
+    }
 }
 
 export { sort_global_declarations };