wip, mol-script

src/mol-script/runtime/environment.ts

@@ -4,10 +4,10 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Symbol } from '../symbol'
+import { Symbol } from '../language/symbol'
 import { SymbolRuntime } from './symbol'
 import { Macro } from './macro';
-import Expression from '../expression';
+import Expression from '../language/expression';
 
 class Environment {
     readonly runtimeTable: SymbolRuntime.Table;

src/mol-script/runtime/macro.ts

@@ -4,7 +4,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import Expression from '../expression';
+import Expression from '../language/expression';
 
 interface Macro {
     readonly argNames: ReadonlyArray<string>,

src/mol-script/runtime/symbol.ts

@@ -6,7 +6,7 @@
 
 import Environment from './environment'
 import RuntimeExpression from './expression'
-import Expression from '../expression';
+import Expression from '../language/expression';
 
 type SymbolRuntime = SymbolRuntime.Dynamic | SymbolRuntime.Static
 

src/mol-script/script/mol-script/macro.ts

@@ -5,7 +5,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import B from '../../builder'
+import B from '../../language/builder'
 
 export function getPositionalArgs(args: any) {
     return Object.keys(args)

src/mol-script/script/mol-script/parser.ts

@@ -5,8 +5,8 @@
  */
 
 import { MonadicParser as P } from 'mol-util/monadic-parser'
-import Expression from '../../expression'
-import B from '../../builder'
+import Expression from '../../language/expression'
+import B from '../../language/builder'
 
 export function parseMolScript(input: string) {
     return Language.parse(input);

src/mol-script/script/mol-script/symbols.ts

@@ -4,13 +4,13 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Symbol, Arguments, Argument } from '../../symbol'
-import B from '../../builder'
+import { Symbol, Arguments, Argument } from '../../language/symbol'
+import B from '../../language/builder'
 import * as M from './macro'
-import MolScript from '../../symbol-table'
-import Type from '../../type'
-import * as Struct from '../../symbol-table/structure-query'
-import Expression from '../../expression'
+import MolScript from '../../language/symbol-table'
+import Type from '../../language/type'
+import * as Struct from '../../language/symbol-table/structure-query'
+import Expression from '../../language/expression'
 import { UniqueArray } from 'mol-data/generic'
 
 export type MolScriptSymbol =

src/mol-script/script/parser.ts

@@ -5,7 +5,7 @@
  * @author Alexander Rose <alexanderose@weirdbyte.de>
  */
 
-import Expression from '../expression'
+import Expression from '../language/expression'
 
 type Parser = (source: string) => Expression