godprotocol 1.1.0 → 1.1.1

package/Loader_sequence/main.js

@@ -1,62 +1,87 @@
-import { _id } from "generalised-datastore/utils/functions";
-import Repository from "./repository";
+import Repository from './repository'
 
 let num_pattern = /^\d+(\.\d+)?$/;
 let var_pattern = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
-let addr_pattern = /^(@\/|\.\.\/|\.\/)?([A-Za-z0-9_\-]+\/)*[A-Za-z0-9_\-]+$/
 
 class Loader {
-  constructor(account) {
+  constructor(account){
     this.account = account;
-    this.opcodes = new Array();
-    this.instructions = new Array();
-
-    this.instruction_indexes = new Array();
-    this.instruction_stacks = [[]];
-    this.stacks = new Array(account.physical_address);
-    this.markers = new Array();
-    this.program_configs = new Array();
-    this.programs_index = -1;
-    
+
     this.datatypes = new Array('twain', 'string','void', 'boolean', 'array', 'number')
-    this.configs = new Object()
 
     // Code Repository
     this.repository = new Repository(this);
   }
 
-  instruction_index = () => {
-    let len = this.instruction_indexes.length -1
-    this.instruction_indexes[len]++
+  twain_entries = tokens => {
+    let values = [[]]
+    for (let v=0; v< tokens.length; v++){
+      let val = tokens[v]
+      if (val.type === 'separator' && val.value === ':'){
+        continue
+      }
 
-    return this.instruction_indexes[len]
-  };
+      let prev_value = values.slice(-1)[0]
+      if (prev_value.length === 2){
+        prev_value = []
+        values.push(prev_value)
+      }
 
-  stack_instruction = (instruction) => {
-    if (Array.isArray(instruction))
-      return instruction.map((i) => this.stack_instruction(i));
-      
-    this.instruction_stacks.slice(-1)[0].push(instruction);
-  };
+      prev_value.push(val)
+    }
 
-  new_stack = (addr) => {
-    this.stacks.push(addr);
-  };
+    return values;
+  }
 
-  push_instruction = (instruction) => {
-    if (Array.isArray(instruction))
-      return instruction.map((i) => this.push_instruction(i));
+  objectify = token =>{
+    if (Array.isArray(token)) return token.map(tok=>this.objectify(tok))
 
-    if (this.pure) {
-      this.instructions.push(instruction);
-    } else {
-      this.stack_instruction(`cursor ${this.instruction_index()}`);
+    let obj;
 
-      this.stack_instruction(`write ${instruction}`);
+    switch(token.type){
+      case "twain":
+        obj = new Object()
+
+        let entries = this.twain_entries(token.value)
+        for(let v=0; v< entries.length; v++){
+          let val = entries[v]
+          
+          obj[this.objectify(val[0])] = this.objectify(val[1])
+        }
+
+        break
+      ;
+      case "array":
+        obj = new Array()
+
+        for (let a=0; a < token.value.length; a++){
+          let item = token.value[a]
+          obj.push(this.objectify(item))
+        }
+        break
+      ;
+      case "boolean":
+        obj = JSON.parse(token.value)
+        break
+      ;
+      case "string":
+        obj = token.value
+        break
+      ;
+      case "number":
+        obj = Number(token.value)
+        break
+      ;
+      case "void":
+        obj = null
+        break
+      ;
     }
-  };
 
-  parse_tokens = (line, options) => {
+    return obj;
+  }
+
+  tokenise = (line, options) => {
     options = options ||{}
     let {stop_char, all_static, inline} = options;
 
@@ -121,7 +146,7 @@ class Loader {
         let pre_stat = all_static
         if(!stop_char && !this.pure)all_static = true;
         
-        let toks = this.parse_tokens(line.slice(pos),{stop_char: "]", all_static});
+        let toks = this.tokenise(line.slice(pos),{stop_char: "]", all_static});
         if(stop_char) all_static = toks.all_static && all_static
         else all_static = toks.all_static 
 
@@ -134,7 +159,7 @@ class Loader {
         let pre_stat = all_static
         if(!stop_char && !this.pure)all_static = true;
         
-        let toks = this.parse_tokens(line.slice(pos), {stop_char: "}", all_static});
+        let toks = this.tokenise(line.slice(pos), {stop_char: "}", all_static});
         if(stop_char) all_static = toks.all_static && all_static
         else all_static = toks.all_static 
 
@@ -187,7 +212,7 @@ class Loader {
         }
         
         acc = acc.trim()
-        push_token(acc, ['True', 'False'].includes(acc)?'boolean':  acc ==='Void'?'void':this.opcodes.includes(acc) ? "opcode" : "variable");
+        push_token(acc, ['true', 'false'].includes(acc)?'boolean':  acc ==='Void'?'void':this.opcodes.includes(acc) ? "opcode" : "variable");
 
       }
     }
@@ -195,301 +220,7 @@ class Loader {
     return tokens;
   };
 
-  static_parse = ({token, previous_pure, options, identifier}, fn)=>{
-    this.pure = token.all_static?'stack':previous_pure
-
-    let physical_address = this.stacks.slice(-1)[0]
-    if(!identifier && token.all_static && !options.all_static){
-      identifier = {value: this.account.manager.oracle.hash(token, 'sha-1')}
-      if (!isNaN(Number(identifier.value[0]))){
-        identifier.value = `_${identifier.value}`
-      }
-    }
-    if (token.all_static && !options.all_static){
-      this.push_instruction(`link ${physical_address}/${identifier.value}`)
-    }
-
-    fn()
-
-    if (token.all_static && identifier &&!options.all_static){
-      this.push_instruction([
-        'cursor {output}',
-        'write {datapath:-1}'
-      ])
-      this.push_instruction(`pop ${identifier.value}`)
-    }
-
-    this.pure = previous_pure
-
-    !options.all_static && token.all_static && !options.identifier &&
-    this.push_instruction([`link ${physical_address}/${identifier.value}`, `pop ${identifier.value}`])
-  }
-
-  parse = (token, options) => {
-    options = options || {}
-    let {identifier} = options;
-
-    let previous_pure = this.pure;
-    if (token.type === "string" || token.type === "number") {
-      this.static_parse({options, previous_pure, token, identifier}, ()=>{
-        this.push_instruction([
-          `link ${
-            this.account.physical_address
-          }/Datatypes/${`${token.type[0].toUpperCase()}${token.type.slice(1)}`}`,
-          `write ${token.value}`,
-          `pop ${token.type}`,
-        ]);
-      })
-
-    } else if (token.type === "array") {
-     
-      this.static_parse({token, previous_pure, options, identifier}, ()=>{
-        this.push_instruction(
-          `link Accounts/${this.account.name}/Datatypes/Array`
-        );
-        if (token.value.length){
-          token.value.map((item, i) => {
-            this.parse(item, {all_static: this.pure === 'stack'});
-
-              this.push_instruction([
-                `cursor ${i}`,
-                `write ${
-                  this.is_not_literal(item.type)
-                    ? "{metadata.output:-1}"
-                    : "{datapath:-1}"
-                }`,
-              ]);
-          });
-        }
-        
-        this.push_instruction(`pop Array`);
-      })
-
-    } else if (token.type === "twain") {
-     
-      this.static_parse({token, previous_pure, options, identifier}, ()=>{
-        this.push_instruction(
-          `link Accounts/${this.account.name}/Datatypes/Twain`
-        );
-  
-        if (token.value.length){
-           let curs = true;
-          token.value.map((entry) => {
-            if (entry.type === "separator") {
-              curs = false;
-              return;
-            }
-            this.parse(entry, {all_static: this.pure === 'stack'});
-            if (curs) {
-              {
-                this.push_instruction(
-                  `cursor {*${
-                    this.is_not_literal(entry.type)
-                      ? "metadata.output:-1"
-                      : "datapath:-1"
-                  }}`
-                );
-              }
-            } else {
-              this.push_instruction(
-                `write ${
-                  this.is_not_literal(entry.type)
-                    ? "{metadata.output:-1}"
-                    : "{datapath:-1}"
-                }`
-              );
-              curs = true;
-            }
-          });
-        }
-       
-        this.push_instruction(`pop Twain`);
-  
-      })
-     
-    } else if (token.type === "variable") {
-      let tok_value = token.value;
-
-      let is_nested = this.handle_nested(tok_value)
-
-      this.push_instruction([
-        `link ${is_nested?'{metadata.output:-1}': `${this.stacks.slice(-1)[0]}/${tok_value}`}`,
-        `pop ${tok_value}`,
-      ]);
-    }else if(token.type==='void'){
-      this.push_instruction([`link ${this.account.physical_address}/Datatypes/Void`, 'pop Void'])
-    }else if (token.type === 'boolean'){
-      this.push_instruction([`link ${this.account.physical_address}/Datatypes/Boolean`, `write ${token.value}`, 'pop Boolean'])
-    } else if (token.type === "address") this.parse_assignment(token);
-  };
-
-  handle_nested = tok_value=>{
-    let is_nested= tok_value.startsWith('(')
-    if (is_nested){
-      let val = tok_value.slice(1,-1)
-      if(val.startsWith('@') || val.startsWith('.')){
-        val = this.resolve_addr(val)
-        this.push_instruction([`link ${val}`, 'pop'])
-      } else this.push_instruction([`link ${`${this.current_program().physical_address}/${val}`}`, `pop ${val}`])
-    }
-
-    return is_nested
-  }
-
-  throw_error=(msg, token)=>{
-    let pth = this.current_program()
-    pth = pth.physical_address
-    throw new Error(`${msg}:${this.line_count}/col:${token.pos}\n\t${pth||''}`)
-  }
-
-  is_not_literal = (type) =>
-    !type || ["variable", "opcode", "address"].includes(type);
-
-  parse_assignment = (line, linked) => {
-    let tokens = linked || line.type ? line : this.parse_tokens(line);
-
-    let identifier = tokens[0], is_nested, curr_program;
-    
-    if (linked || line.type) {
-      let line_split = (line.value || line)
-        .slice(line.value ? null : 1)
-        .trim()
-        .split(" ");
-      let path = line_split[0].split("/");
-
-      this.push_instruction(`link ${this.resolve_addr(path.join("/"))}`);
-
-      tokens = !line.type && this.parse_tokens(line_split.slice(1).join(" "));
-      tokens.unshift && tokens.unshift(null);
-      if (line.type === "address")
-        return this.push_instruction(`pop ${path[path.length - 1]}`);
-    } else {
-      curr_program = this.current_program();
-      curr_program && curr_program.dimensions.push({ name: identifier.value });
-
-       is_nested = this.handle_nested(identifier.value)
-
-      this.push_instruction(`chain ${is_nested?'{metadata.output:-1}': identifier.value}`);
-
-
-      if (tokens.length > 1){
-        let pre_tok = tokens.slice(-1)[0]
-        if (pre_tok.all_static){}
-        else
-        !is_nested && this.stack_instruction([
-          `link ${this.stacks.slice(-1)[0]}`,
-          `chain ${identifier.value}`,
-          `pop ${identifier.value}`,
-          "pop",
-        ]);
-      }
-     
-    }
-
-    let prev_token;
-    if (tokens[1] && tokens[1].type === "opcode") {
-      this.parse_opcode(tokens.slice(1));
-      prev_token = tokens[1];
-    } else {
-      tokens.slice(1).map((tok) => {
-        this.parse(tok, {identifier});
-      });
-      prev_token = tokens.slice(-1)[0];
-    }
-
-    if (!this.pure&& !is_nested && identifier.type === 'variable'){
-       let config = this.configs[curr_program.physical_address]
-        if(!config){
-          config = {
-            parameters:[], 
-            identifiers: [], 
-            name: curr_program.program_name, 
-            __address__: curr_program.physical_address, 
-            type:'module'
-          }
-          this.configs[curr_program.physical_address] = config;
-        }else {
-          // console.log(config, 'conff')
-        }
-
-        if (tokens[1]&& this.datatypes.includes(tokens[1].type)){
-          config.parameters.push({name: identifier.value, object: tokens[1].static_value, position: config.parameters.length})
-        }else if (!tokens[1]){
-          config.parameters.push({name: identifier.value, address: `${this.account.physical_address}/Datatypes/Void`, position:config.parameters.length})
-        }
-        config.identifiers.push(identifier.value)
-    }
-   
-    if (tokens.length > 1) {
-      if (prev_token && prev_token.all_static){
-        this.push_instruction([`pop ${identifier.value}`])
-      }else {
-         this.push_instruction([
-          "cursor {output}",
-          `write ${
-            this.is_not_literal(prev_token && prev_token.type) 
-              ? "{metadata.output:-1}"
-              : "{datapath:-1}"
-          }`,
-          `pop ${identifier.value}`,
-        ]);
-      }
-     
-    } else this.push_instruction(`pop ${identifier.value}`);
-
-
-  };
-
-  current_program = () => {
-    return this.program_configs[this.programs_index];
-  };
-
-  marker_pattern = /@[a-zA-Z_][a-zA-Z0-9_]*/;
-
-  parse_opcode = (line, assign) => {
-    let tokens = Array.isArray(line) ? line : this.parse_tokens(line);
-
-    let op = tokens[0];
-
-    if (op.type !== "opcode") return this.parse(op);
-
-    this.push_instruction([
-      `link Accounts/${this.account.name}/Opcodes/${op.value}`,
-      `link Accounts/${this.account.name}/Datatypes/Twain`,
-    ]);
-
-    tokens.slice(1).map((tok, i) => {
-      if (tok.type === "address" && tok.value.match(this.marker_pattern)) {
-        this.push_instruction([
-          `link ${this.account.physical_address}/Datatypes/Number`,
-          `write ${tok.value}`,
-          `pop Number`,
-        ]);
-      } else this.parse(tok);
-
-      this.push_instruction([
-        `cursor op${i}`,
-        `write ${
-          tok.all_static || (this.is_not_literal(tok.type) &&
-          !(tok.type === "address" && tok.value.match(this.marker_pattern)))
-            ? "{metadata.output:-1}"
-            : "{datapath:-1}"
-        }`,
-      ]);
-    });
-
-    this.push_instruction([
-      "pop Twain",
-      "cursor inputs",
-      `write {datapath:-1}`,
-      op.value,
-      `cursor {output}`,
-      `write {datapath:-1}`,
-      `pop ${op.value}`,
-    ]);
-  };
-
-  resolve_addr = (addr) => {
+  resolve_address = (addr, shards) => {
     let real_addr = addr;
     addr = addr.split("/");
 
@@ -500,7 +231,7 @@ class Loader {
       addr[0] = this.account.physical_address;
       real_addr = addr.join("/");
     } else if (addr[0] === ".." || addr[0] === ".") {
-      let curr_addr = this.stacks.slice(-1)[0].split("/");
+      let curr_addr = shards.slice(-1)[0].physical_address.split("/");
       while (addr[0] === ".." || addr[0] === ".") {
         if (addr[0] === "..") curr_addr.splice(-1);
         delete addr[0];
@@ -511,295 +242,46 @@ class Loader {
     return real_addr;
   };
 
-  new_stack_instructions = (new_stack) => {
-    let curr_stack = this.stacks.slice(-1)[0].split("/");
-    new_stack = new_stack.split("/");
-
-    let physical_address = new_stack.join("/");
-    let program = {
-      program_name: new_stack[new_stack.length - 1],
-      physical_address,
-      codes: [],
-      dimensions: [],
-      sub_programs: [],
-      _id: _id("programs"),
-    };
-    let curr_program = this.current_program();
-    if (curr_program) curr_program.sub_programs.push(program._id);
-
-    this.programs_index++;
-    this.program_configs.push(program);
-
-    if (curr_stack[1] !== new_stack[1]) {
-    } else {
-      for (let j = 2; j < new_stack.length; j++)
-        this.stack_instruction(`chain ${new_stack[j]}`);
-
-      this.stack_instruction(
-        `link ${this.account.physical_address}/Datatypes/Array`
-      );
-    }
-  };
-
-  parse_routine = (line) => {
-    let addr = this.resolve_addr(line);
-
-    this.instruction_stacks.push([]);
-    this.new_stack_instructions(addr);
-    this.new_stack(addr);
-
-    this.instruction_indexes.push(-1);
-  };
 
-  pop = () => {
-    let addr = this.stacks.splice(-1)[0].split("/");
-    this.stack_instruction([
-      `pop Array`,
-      `cursor {program}`,
-      `write {datapath:-1}`,
-    ]);
-
-    for (let j = 2; j < addr.length; j++)
-      this.stack_instruction(`pop ${addr[j]}`);
-
-    this.instructions.push(...this.instruction_stacks.splice(-1)[0]);
-    this.programs_index--;
-
-    this.instruction_indexes.pop();
-  };
+  shard_instructions = (instructions, physical_address) => {
+    let done = []
+    let shards = [{physical_address, instructions:[]}]
 
-  revamp_marks = () => {
-    let instruction_stack = this.instruction_stacks.slice(-1)[0];
+    for (let i =0; i < instructions.length; i++){
+      let line = instructions[i].trim();
 
-    instruction_stack = instruction_stack.map((ins) =>
-      this.resolve_offset(ins, true)
-    );
+      if (!line)continue
 
-    this.instruction_stacks[this.instruction_stacks.length - 1] =
-      instruction_stack;
-  };
-
-  handle_marker = (line) => {
-    let splits = line.slice(1).split(" ");
-    let name = splits[0];
-
-    let curr_stack = this.stacks.slice(-1)[0];
-    let markers = this.markers[curr_stack];
-    if (!markers) {
-      markers = new Object();
-      this.markers[curr_stack] = markers;
-    }
-    
-    markers[name] = this.instruction_indexes.slice(-1)[0];
-
-    this.revamp_marks();
-
-    return splits.slice(1).join(" ");
-  };
-
-  resolve_offset = (line, revamping) => {
-    let matches = line.match(this.marker_pattern),
-      value;
-    if (matches) {
-      let match = matches[0].slice(1);
-
-      let curr_stack = this.stacks.slice(-1)[0];
-      let markers = this.markers[curr_stack];
-      if (!markers) {
-        markers = new Object();
-        this.markers[curr_stack] = markers;
-      }
-      value = markers[match];
-    }
-
-    if (typeof value === "number")
-      {line = line.replace(
-        this.marker_pattern,
-        (revamping&&value>0?value+1: value+1).toString()
-      );
-
-    }
-
-    return line;
-  };
-
-  parse_comment = (line) => {
-    line = line.split(":");
-    if (line.length <= 1) return;
-
-    let curr_program = this.current_program();
-    let line1 = line[0].split(".");
-    let obj = curr_program;
-
-    for (let l = 0; l < line1.length - 1; l++) {
-      let term = line1[l];
-
-      if (term.trim() === "_id") break;
-
-      let n_term = Number(term);
-
-      if (n_term) {
-        obj = obj[n_term];
-      } else obj = obj[term];
-    }
-    if (!obj) return;
-
-    let index = line1[line1.length - 1];
-    let n_indx = Number(index);
-    if (!isNaN(n_indx)) index = n_indx;
-
-    if (index === "_id") return;
-
-    obj[index] = line.slice(1).join(":").trim();
-  };
-
-  spawn = () => {
-    let spaw = new Loader(this.account);
-    spaw.opcodes = [...this.opcodes];
-
-    return spaw;
-  };
-
-  line_count = 0
-
-  compile = (codes) => {
-    let code_array = codes.split("\n");
-
-    for (let c = 0; c < code_array.length; c++) {
-      let line = code_array[c].trim();
-      this.line_count++
-
-      let curr_program = this.current_program();
-      this.is_routine = line.startsWith(".") || line.startsWith("@");
-
-      this.handle_codes(line, curr_program);
-
-      if (!line) continue;
-
-      if (line.startsWith(":")) {
-        line = this.handle_marker(line);
-        if (!line) continue;
-      }
-
-      if (this.config_flag){
-        this.handle_config(line)
-        this.config_flag = false;
-        continue;
-      }
-
-      line = this.resolve_offset(line);
-      if(line.startsWith('$')){
-        this.handle_decor(line)
+      if(line === '$config_flag'){
+        let shrd = shards.slice(-1)[0]
+        shrd.config = JSON.parse(instructions[i+1])
+        shrd.config.__address__ = this.account.vm.resolve_addr(shrd.config.__address__)
+        shrd.config.globe = this.account.vm.resolve_addr(shrd.config.globe)
+        shrd.config.real_address = this.account.vm.resolve_addr(shrd.config.real_address)
+        if(shrd.config.methods){
+          for (let m in shrd.config.methods){
+            let met = shrd.config.methods[m]
+            shrd.config.methods[m] = this.account.vm.resolve_addr(met)
+          }
+        }
+        
+        i++
+        shards.slice(-2)[0].instructions.push(`config ${JSON.stringify({...shrd.config, sequence: shrd.instructions})}`)
         continue
-      } else 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(">@") || line.startsWith(">."))
-        this.parse_assignment(line, true);
-      else if (line.startsWith(">")){
-        let res =this.check_recursive(line)
-        this.parse_assignment(res);
-      } else this.parse_opcode(line);
-
-      (!curr_program || this.is_routine) &&
-        this.handle_codes(line, this.current_program());
-
-        if (this.pure> 0)this.pure--
       }
-      
-      this.no_static = false
-  };
-
-  handle_config = config=>{
-    this.pure = true
-    this.parse_opcode(`config ${config}`)
-    this.pure = false
-  }
-
-  check_recursive=line=>{
-    line = line.slice(1).split(' ').filter(l=>!!l)
-
-    let identifier = line[0]
-    
-    let recurse =  line.slice(1).find(l=>l===identifier);
-    if (recurse){
-      let new_var = `temp_${identifier}_${this.account.manager.oracle.hash(identifier, 'sha1')}`
-      this.parse_assignment(`>${new_var} ${identifier}`)
-      line = line.slice(1).map(l=>{
-        if(l===identifier)return new_var
-        return l
-      })
-      line.unshift(identifier)
-    }
-    
-    line =`>${line.join(' ')}`
-
-    return line
-  }
-
-  handle_decor = line=>{
-    line= line.slice(1).split(' ')
-
-    this[line[0]] = Number(line[1]) || 1
-  }
-
-  handle_codes = (line, curr_program) => {
-    if (this.is_routine) {
-      let tilline = `~${line}`;
-      let prev_program = this.program_configs[this.programs_index - 1];
-      prev_program && prev_program.codes.push(tilline);
-
-      curr_program &&
-        !curr_program.codes.find((line) => !!line.trim()) &&
-        curr_program.codes.push(line);
-    }
-
-    !this.is_routine && curr_program && curr_program.codes.push(line);
-  };
 
-  run = (codes, meta) => {
-    if (!meta) meta = {};
-    let { pure, cb, options , unshift} = meta;
-    let{main, configs}=options ||{}
-    this.pure = pure? -1:0;
-
-    this.compile(codes);
-
-    if (meta.instructions) return [...this.instructions];
-
-    // console.log(JSON.stringify(this.instructions, null, 2), "hiya");
-    if(this.pure)this.account.log_output(this.instructions)
-
-    this.account.load({
-      program: { instructions: [...this.instructions], unshift: !!unshift},
-      callback: cb,
-    });
-
-    let pragma = this.program_configs[0];
-    if (pragma)
-      pragma.main =
-        (main) || this.repository.oracle.hash(codes);
-    this.program_configs.map((config) => this.repository.add_program(config));
-
-    if(configs === 'pragma_only'){
-      this.set_config(this.configs[pragma.physical_address])
-    }else {
-      for (let addr in this.configs){
-        let config = this.configs[addr]
-        this.set_config(config)
+      if (line.startsWith('.') || line.startsWith('@')){
+        let addr = this.resolve_address(line, shards)
+        shards.push({physical_address: addr, instructions: []})
+      }else if (line.trim() === ';'){
+        done.push(shards.pop())
+      }else {
+        shards.slice(-1)[0].instructions.push(line)
       }
     }
-    this.configs = new Object()
-
-    this.program_configs = new Array();
-    this.instructions = new Array();
-    this.pure = false;
-  };
 
-  set_config = (config)=>{
-    config&& 
-    this.account.execute('config', {op0: config})
+    return done
   }
 }
 
-export default Loader;
+export default Loader