From 70552be5cd547c572abf461f6c0a10b22f7d6ce5 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Tue, 7 Aug 2018 18:56:14 +0200
Subject: [PATCH] wip, mol-script
---
src/mol-script/{ => language}/builder.ts | 0
src/mol-script/{ => language}/container.ts | 0
.../{ => language}/expression-formatter.ts | 0
src/mol-script/{ => language}/expression.ts | 0
src/mol-script/{ => language}/helpers.ts | 0
src/mol-script/{ => language}/symbol-table.ts | 0
src/mol-script/{ => language}/symbol-table/core.ts | 0
.../{ => language}/symbol-table/structure-query.ts | 0
src/mol-script/{ => language}/symbol.ts | 0
src/mol-script/{ => language}/type.ts | 0
src/mol-script/runtime/environment.ts | 4 ++--
src/mol-script/runtime/macro.ts | 2 +-
src/mol-script/runtime/symbol.ts | 2 +-
src/mol-script/script/mol-script/macro.ts | 2 +-
src/mol-script/script/mol-script/parser.ts | 4 ++--
src/mol-script/script/mol-script/symbols.ts | 12 ++++++------
src/mol-script/script/parser.ts | 2 +-
17 files changed, 14 insertions(+), 14 deletions(-)
rename src/mol-script/{ => language}/builder.ts (100%)
rename src/mol-script/{ => language}/container.ts (100%)
rename src/mol-script/{ => language}/expression-formatter.ts (100%)
rename src/mol-script/{ => language}/expression.ts (100%)
rename src/mol-script/{ => language}/helpers.ts (100%)
rename src/mol-script/{ => language}/symbol-table.ts (100%)
rename src/mol-script/{ => language}/symbol-table/core.ts (100%)
rename src/mol-script/{ => language}/symbol-table/structure-query.ts (100%)
rename src/mol-script/{ => language}/symbol.ts (100%)
rename src/mol-script/{ => language}/type.ts (100%)
diff --git a/src/mol-script/builder.ts b/src/mol-script/language/builder.ts
similarity index 100%
rename from src/mol-script/builder.ts
rename to src/mol-script/language/builder.ts
diff --git a/src/mol-script/container.ts b/src/mol-script/language/container.ts
similarity index 100%
rename from src/mol-script/container.ts
rename to src/mol-script/language/container.ts
diff --git a/src/mol-script/expression-formatter.ts b/src/mol-script/language/expression-formatter.ts
similarity index 100%
rename from src/mol-script/expression-formatter.ts
rename to src/mol-script/language/expression-formatter.ts
diff --git a/src/mol-script/expression.ts b/src/mol-script/language/expression.ts
similarity index 100%
rename from src/mol-script/expression.ts
rename to src/mol-script/language/expression.ts
diff --git a/src/mol-script/helpers.ts b/src/mol-script/language/helpers.ts
similarity index 100%
rename from src/mol-script/helpers.ts
rename to src/mol-script/language/helpers.ts
diff --git a/src/mol-script/symbol-table.ts b/src/mol-script/language/symbol-table.ts
similarity index 100%
rename from src/mol-script/symbol-table.ts
rename to src/mol-script/language/symbol-table.ts
diff --git a/src/mol-script/symbol-table/core.ts b/src/mol-script/language/symbol-table/core.ts
similarity index 100%
rename from src/mol-script/symbol-table/core.ts
rename to src/mol-script/language/symbol-table/core.ts
diff --git a/src/mol-script/symbol-table/structure-query.ts b/src/mol-script/language/symbol-table/structure-query.ts
similarity index 100%
rename from src/mol-script/symbol-table/structure-query.ts
rename to src/mol-script/language/symbol-table/structure-query.ts
diff --git a/src/mol-script/symbol.ts b/src/mol-script/language/symbol.ts
similarity index 100%
rename from src/mol-script/symbol.ts
rename to src/mol-script/language/symbol.ts
diff --git a/src/mol-script/type.ts b/src/mol-script/language/type.ts
similarity index 100%
rename from src/mol-script/type.ts
rename to src/mol-script/language/type.ts
diff --git a/src/mol-script/runtime/environment.ts b/src/mol-script/runtime/environment.ts
index 4092a6786..c969ecdf6 100644
--- a/src/mol-script/runtime/environment.ts
+++ b/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;
diff --git a/src/mol-script/runtime/macro.ts b/src/mol-script/runtime/macro.ts
index cb7524054..4d5128886 100644
--- a/src/mol-script/runtime/macro.ts
+++ b/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>,
diff --git a/src/mol-script/runtime/symbol.ts b/src/mol-script/runtime/symbol.ts
index c0f0451cf..5a53a4ba8 100644
--- a/src/mol-script/runtime/symbol.ts
+++ b/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
diff --git a/src/mol-script/script/mol-script/macro.ts b/src/mol-script/script/mol-script/macro.ts
index 658e9ce98..a2c9c5a7c 100644
--- a/src/mol-script/script/mol-script/macro.ts
+++ b/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)
diff --git a/src/mol-script/script/mol-script/parser.ts b/src/mol-script/script/mol-script/parser.ts
index 03a494f63..b313de302 100644
--- a/src/mol-script/script/mol-script/parser.ts
+++ b/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);
diff --git a/src/mol-script/script/mol-script/symbols.ts b/src/mol-script/script/mol-script/symbols.ts
index 9c9cec57b..2d25e4338 100644
--- a/src/mol-script/script/mol-script/symbols.ts
+++ b/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 =
diff --git a/src/mol-script/script/parser.ts b/src/mol-script/script/parser.ts
index 122b2e844..d318080d5 100644
--- a/src/mol-script/script/parser.ts
+++ b/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
--
GitLab