godprotocol 1.0.837 → 1.0.839

package/Index.js

@@ -1,30 +1,57 @@
 import Manager from "./Objects/Manager";
 import create_server from "./utils/create_server";
 
-let manager = new Manager();
-
-let initiator = manager.initiate({
-  on_framed: () =>
-    initiator.assembler.run(
-      `@/datastore/main
-
-@/datastore/main/grey
->matter 'lola'
-;
-
-
-    >storage {}
-    
-    ;`,
-      {
-        cb: (blks) => {
-          console.log(!!blks, "did");
-        },
-      }
-    ),
-});
-
-create_server(null, { manager });
+// let manager = new Manager();
+
+// let initiator = manager.initiate({
+//   on_framed: () =>
+//     initiator.assembler.run(
+//       `@/datastore/main
+
+//       >object
+//       >keys []
+//       >entries {}
+//       >size 0
+
+//       ./set
+//       >key
+//       >key_static getter key "static_value"
+//       >value
+//       >exists getter ../entries key
+//       jmp_not_void :proceed
+//       >../size add ../size 1
+//       >../keys setter ../keys -1 key
+
+//       :proceed
+//       >../entries setter ../entries key_static value
+//       ;
+
+//       ./get
+//       >key
+//       >value getter ../entries key
+//       ;
+
+//       ./remove
+//       >key
+//       >../entries delete ../entries key
+//       >../keys delete ../keys key
+//       >../size sub ../size 1
+//       ;
+
+//       ./get_keys
+//       >output ../keys
+//       ;
+
+//     ;`,
+//       {
+//         cb: (blks) => {
+//           console.log(blks, blks.length, "did");
+//         },
+//       }
+//     ),
+// });
+
+// create_server(null, { manager });
 
 export default Manager;
 export { create_server };

package/Loader_sequence/main.js

@@ -65,6 +65,7 @@ class Loader {
     while (pos < line.length) {
       let char = line[pos].trim();
 
+      console.log(char);
       if (char === stop_char) return { tokens, pos };
 
       if (!char) {
@@ -76,7 +77,7 @@ class Loader {
       if (char === "\n") {
         line_number++;
         pos++;
-      } else if (char === "@") {
+      } else if (char === "@" || char === ".") {
         let acc = "";
         while (line[pos] && line[pos].trim()) {
           acc += line[pos];
@@ -110,7 +111,7 @@ class Loader {
         }
         pos++;
         push_token(acc, "string");
-      } else if (num_pattern.test(char)) {
+      } else if (num_pattern.test(char) || char === "-") {
         let acc = char;
         pos++;
         while (
@@ -281,6 +282,8 @@ class Loader {
     ]);
 
     tokens.slice(1).map((tok, i) => {
+      if (tok.type === "address") tok.value = this.resolve_addr(tok.value);
+
       if (tok.type === "address" && tok.value.match(this.marker_pattern)) {
         this.push_instruction([
           `link ${this.account.physical_address}/Datatypes/Number`,
@@ -476,6 +479,7 @@ class Loader {
     for (let c = 0; c < code_array.length; c++) {
       let line = code_array[c].trim();
 
+      console.log(line);
       let curr_program = this.current_program();
       this.is_routine = line.startsWith(".") || line.startsWith("@");
 
@@ -494,7 +498,8 @@ class Loader {
       if (line === ";") this.pop();
       else if (this.is_routine) this.parse_routine(line);
       else if (line.startsWith("//")) this.parse_comment(line.slice(2).trim());
-      else if (line.startsWith(">@")) this.parse_assignment(line, true);
+      else if (line.startsWith(">@") || line.startsWith(">."))
+        this.parse_assignment(line, true);
       else if (line.startsWith(">")) this.parse_assignment(line);
       else this.parse_opcode(line);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "1.0.837",
+  "version": "1.0.839",
   "description": "A data mediator.",
   "main": "Index.js",
   "types": "types/index.d.ts",

package/utils/create_server.js

@@ -90,7 +90,7 @@ const create_server = async (app, settings) => {
 
   server.listen(port, () => {
     console.log(`\n...GOD PROTOCOL RUNNING :${port}`);
-    manager.add_server({ ...settings.server_details, port: PORT });
+    settings.manager.add_server({ ...settings.server_details, port: PORT });
   });
 };