From f27ec4d6a458f9b14a92029da76d38607ddee8c8 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Fri, 9 Sep 2022 15:36:08 -0700
Subject: [PATCH] formatting
---
src/mol-script/transpilers/all.ts | 6 ++++--
src/mol-script/transpilers/helper.ts | 4 +++-
src/mol-script/transpilers/jmol/examples.ts | 6 ++++--
src/mol-script/transpilers/jmol/markdown-docs.ts | 9 ++++++---
src/mol-script/transpilers/jmol/operators.ts | 2 +-
src/mol-script/transpilers/jmol/parser.ts | 3 +--
src/mol-script/transpilers/jmol/properties.ts | 9 ++++++---
src/mol-script/transpilers/jmol/symbols.ts | 9 ++++++---
src/mol-script/transpilers/pymol/examples.ts | 4 +++-
src/mol-script/transpilers/pymol/markdown-docs.ts | 4 +++-
src/mol-script/transpilers/pymol/operators.ts | 4 +++-
src/mol-script/transpilers/pymol/parser.ts | 5 ++++-
src/mol-script/transpilers/pymol/properties.ts | 6 ++++--
src/mol-script/transpilers/pymol/symbols.ts | 4 +++-
src/mol-script/transpilers/transpiler.ts | 4 +++-
src/mol-script/transpilers/types.ts | 7 ++++---
src/mol-script/transpilers/vmd/examples.ts | 4 +++-
src/mol-script/transpilers/vmd/functions.ts | 2 ++
src/mol-script/transpilers/vmd/keywords.ts | 4 +++-
src/mol-script/transpilers/vmd/markdown-docs.ts | 4 +++-
src/mol-script/transpilers/vmd/operators.ts | 4 +++-
src/mol-script/transpilers/vmd/parser.ts | 4 +++-
src/mol-script/transpilers/vmd/properties.ts | 4 +++-
src/mol-script/transpilers/vmd/symbols.ts | 4 +++-
24 files changed, 81 insertions(+), 35 deletions(-)
diff --git a/src/mol-script/transpilers/all.ts b/src/mol-script/transpilers/all.ts
index b1434278e..01f98d664 100644
--- a/src/mol-script/transpilers/all.ts
+++ b/src/mol-script/transpilers/all.ts
@@ -1,7 +1,9 @@
-/*
- * Copyright (c) 2017 MolQL contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
+ *
+ * Adapted from MolQL project
*/
import { transpiler as jmol } from './jmol/parser';
diff --git a/src/mol-script/transpilers/helper.ts b/src/mol-script/transpilers/helper.ts
index b649116dd..90062fc78 100644
--- a/src/mol-script/transpilers/helper.ts
+++ b/src/mol-script/transpilers/helper.ts
@@ -1,9 +1,11 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
* @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
+ * Adapted from MolQL project
*/
import * as P from '../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/jmol/examples.ts b/src/mol-script/transpilers/jmol/examples.ts
index 5da0e8d5f..e1fcac289 100644
--- a/src/mol-script/transpilers/jmol/examples.ts
+++ b/src/mol-script/transpilers/jmol/examples.ts
@@ -1,8 +1,10 @@
-/*
- * Copyright (c) 2017 MolQL contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author David Sehnal <david.sehnal@gmail.com>
+ *
+ * Adapted from MolQL project
*/
export const examples = [{
diff --git a/src/mol-script/transpilers/jmol/markdown-docs.ts b/src/mol-script/transpilers/jmol/markdown-docs.ts
index 813fb82e7..15fd62c6d 100644
--- a/src/mol-script/transpilers/jmol/markdown-docs.ts
+++ b/src/mol-script/transpilers/jmol/markdown-docs.ts
@@ -1,8 +1,11 @@
-/*
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
* Adapted from MolQL project
-*/
+ */
import { properties } from './properties';
import { operators } from './operators';
diff --git a/src/mol-script/transpilers/jmol/operators.ts b/src/mol-script/transpilers/jmol/operators.ts
index b6d25ecb9..ac9db6f00 100644
--- a/src/mol-script/transpilers/jmol/operators.ts
+++ b/src/mol-script/transpilers/jmol/operators.ts
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Koya Sakuma <koya.sakuma.work@gmail.com>
* @author Alexander Rose <alexander.rose@weirdbyte.de>
diff --git a/src/mol-script/transpilers/jmol/parser.ts b/src/mol-script/transpilers/jmol/parser.ts
index 9af92200d..d20f41ec4 100644
--- a/src/mol-script/transpilers/jmol/parser.ts
+++ b/src/mol-script/transpilers/jmol/parser.ts
@@ -5,8 +5,7 @@
* @author Alexander Rose <alexander.rose@weirdbyte.de>
*
* Adapted from MolQL project
- **/
-
+ */
import * as P from '../../../mol-util/monadic-parser';
import * as h from '../helper';
diff --git a/src/mol-script/transpilers/jmol/properties.ts b/src/mol-script/transpilers/jmol/properties.ts
index 77fcf6792..566e6780f 100644
--- a/src/mol-script/transpilers/jmol/properties.ts
+++ b/src/mol-script/transpilers/jmol/properties.ts
@@ -1,8 +1,11 @@
-/*
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
* Adapted from MolQL project
-*/
+ */
import { MolScriptBuilder } from '../../../mol-script/language/builder';
const B = MolScriptBuilder;
diff --git a/src/mol-script/transpilers/jmol/symbols.ts b/src/mol-script/transpilers/jmol/symbols.ts
index 556ff5ad7..6720acb58 100644
--- a/src/mol-script/transpilers/jmol/symbols.ts
+++ b/src/mol-script/transpilers/jmol/symbols.ts
@@ -1,8 +1,11 @@
-/*
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
* Adapted from MolQL project
-*/
+ */
import { properties } from './properties';
import { operators } from './operators';
diff --git a/src/mol-script/transpilers/pymol/examples.ts b/src/mol-script/transpilers/pymol/examples.ts
index 4145efc2c..c92105904 100644
--- a/src/mol-script/transpilers/pymol/examples.ts
+++ b/src/mol-script/transpilers/pymol/examples.ts
@@ -1,9 +1,11 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author David Sehnal <david.sehnal@gmail.com>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
export const examples = [{
diff --git a/src/mol-script/transpilers/pymol/markdown-docs.ts b/src/mol-script/transpilers/pymol/markdown-docs.ts
index 7dfe9f675..0740d545e 100644
--- a/src/mol-script/transpilers/pymol/markdown-docs.ts
+++ b/src/mol-script/transpilers/pymol/markdown-docs.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { properties } from './properties';
diff --git a/src/mol-script/transpilers/pymol/operators.ts b/src/mol-script/transpilers/pymol/operators.ts
index 65be0561a..f1537e3e5 100644
--- a/src/mol-script/transpilers/pymol/operators.ts
+++ b/src/mol-script/transpilers/pymol/operators.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/pymol/parser.ts b/src/mol-script/transpilers/pymol/parser.ts
index 6f5ca1745..b730b2a3e 100644
--- a/src/mol-script/transpilers/pymol/parser.ts
+++ b/src/mol-script/transpilers/pymol/parser.ts
@@ -1,11 +1,14 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
// https://pymol.org/dokuwiki/doku.php?id=selection:alpha
+// https://pymolwiki.org/index.php/Selection_Algebra
// https://github.com/evonove/pymol/blob/master/pymol/layer3/Selector.cpp
import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/pymol/properties.ts b/src/mol-script/transpilers/pymol/properties.ts
index 0b318a5be..04c4bb716 100644
--- a/src/mol-script/transpilers/pymol/properties.ts
+++ b/src/mol-script/transpilers/pymol/properties.ts
@@ -1,9 +1,11 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
- * @author Koya Sakuma
+ * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
+ * Adapted from MolQL project
*/
import { MolScriptBuilder } from '../../../mol-script/language/builder';
diff --git a/src/mol-script/transpilers/pymol/symbols.ts b/src/mol-script/transpilers/pymol/symbols.ts
index 1e02f21be..7e1c89586 100644
--- a/src/mol-script/transpilers/pymol/symbols.ts
+++ b/src/mol-script/transpilers/pymol/symbols.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { properties } from './properties';
diff --git a/src/mol-script/transpilers/transpiler.ts b/src/mol-script/transpilers/transpiler.ts
index 65abb3cd5..1fe04bfc1 100644
--- a/src/mol-script/transpilers/transpiler.ts
+++ b/src/mol-script/transpilers/transpiler.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { Expression } from '../language/expression';
diff --git a/src/mol-script/transpilers/types.ts b/src/mol-script/transpilers/types.ts
index fc85f86ec..1589b8042 100644
--- a/src/mol-script/transpilers/types.ts
+++ b/src/mol-script/transpilers/types.ts
@@ -1,13 +1,14 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import * as P from '../../mol-util/monadic-parser';
import { Expression } from '../language/expression';
-// import Symbol from '../mini-lisp/symbol'
export interface AtomGroupArgs {
[index: string]: any
@@ -35,7 +36,7 @@ export interface Property {
regex: RegExp
map: (s: string) => any
level: 'atom-test' | 'residue-test' | 'chain-test' | 'entity-test'
- property?: any /* Symbol */
+ property?: Expression
}
export type PropertyDict = { [name: string]: Property }
diff --git a/src/mol-script/transpilers/vmd/examples.ts b/src/mol-script/transpilers/vmd/examples.ts
index b720dbd54..fbc65d3bb 100644
--- a/src/mol-script/transpilers/vmd/examples.ts
+++ b/src/mol-script/transpilers/vmd/examples.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
export const examples = [{
diff --git a/src/mol-script/transpilers/vmd/functions.ts b/src/mol-script/transpilers/vmd/functions.ts
index 3d428ca1d..a2db414a9 100644
--- a/src/mol-script/transpilers/vmd/functions.ts
+++ b/src/mol-script/transpilers/vmd/functions.ts
@@ -3,6 +3,8 @@
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { MolScriptBuilder } from '../../../mol-script/language/builder';
diff --git a/src/mol-script/transpilers/vmd/keywords.ts b/src/mol-script/transpilers/vmd/keywords.ts
index 85a4172cc..8d783bf62 100644
--- a/src/mol-script/transpilers/vmd/keywords.ts
+++ b/src/mol-script/transpilers/vmd/keywords.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import * as h from '../helper';
diff --git a/src/mol-script/transpilers/vmd/markdown-docs.ts b/src/mol-script/transpilers/vmd/markdown-docs.ts
index 93a185196..63a44f9ce 100644
--- a/src/mol-script/transpilers/vmd/markdown-docs.ts
+++ b/src/mol-script/transpilers/vmd/markdown-docs.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { properties } from './properties';
diff --git a/src/mol-script/transpilers/vmd/operators.ts b/src/mol-script/transpilers/vmd/operators.ts
index 8b3a29252..e3cddd364 100644
--- a/src/mol-script/transpilers/vmd/operators.ts
+++ b/src/mol-script/transpilers/vmd/operators.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/vmd/parser.ts b/src/mol-script/transpilers/vmd/parser.ts
index eeecd0733..dbe9b7bda 100644
--- a/src/mol-script/transpilers/vmd/parser.ts
+++ b/src/mol-script/transpilers/vmd/parser.ts
@@ -1,9 +1,11 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
* @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
+ * Adapted from MolQL project
*/
import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/vmd/properties.ts b/src/mol-script/transpilers/vmd/properties.ts
index 306b9e152..2cf506943 100644
--- a/src/mol-script/transpilers/vmd/properties.ts
+++ b/src/mol-script/transpilers/vmd/properties.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { MolScriptBuilder } from '../../../mol-script/language/builder';
diff --git a/src/mol-script/transpilers/vmd/symbols.ts b/src/mol-script/transpilers/vmd/symbols.ts
index bc6da7e1a..1740243d4 100644
--- a/src/mol-script/transpilers/vmd/symbols.ts
+++ b/src/mol-script/transpilers/vmd/symbols.ts
@@ -1,8 +1,10 @@
/**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author Alexander Rose <alexander.rose@weirdbyte.de>
* @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
*/
import { properties } from './properties';
--
GitLab