Skip to content

Commit

Permalink
Merge upstream develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@rartino
rartino committed Dec 18, 2019
2 parents 5033820 + 208a258 commit 543b0fc
Show file tree
Hide file tree
Showing 28 changed files with 509 additions and 451 deletions.
54 changes: 49 additions & 5 deletions .words.lst
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
personal_ws-1.1 en 98
personal_ws-1.1 en 142
queryable
prepended
api
yacc
Aa
substring
Substring
supercell
CCaO
whitespace
discoverability
fieldname
Bb
cartesian
conformant
bd
dec
SetZipOpRhs
BaCa
Expand All @@ -18,8 +22,11 @@ FuzzyStringOpRhs
dep
cr
UppercaseLetter
regex
sectnum
OpeningBrace
UUID
PropertyZipAddon
UnicodeHighChar
SiO
ValueZipList
Expand All @@ -29,28 +36,48 @@ UnescapedChar
LowercaseLetter
LengthComparison
IEEE
Edsger
ValueOpRhs
href
SetOpRhs
SiGe
IUPAC's
multi
IdentifierZipAddon
NaN
NaO
RST
namespace
booktitle
versioning
namespaces
jsonapi
param
javascript
ConstantFirstComparison
exmpl
doi
Grammatica
timestamp
EREs
lt
css
nl
metadata
lastname
discoverable
ClNa
ebnf
EBNF
jsonc
nbsp
PredicateComparison
alphanumerics
timestamps
prev
OperatorComparison
BibTeX
lst
IdentifierFirstComparison
BadLuck
libc
Expand All @@ -65,35 +92,52 @@ URI
maintainer's
vt
occupancies
Za
firstname
url
UTC
ACM
downloadable
aax
howpublished
xy
nsites
substrings
mistyped
html
PropertyFirstComparison
ValueList
antlr
boolean
implementers
zeolites
Zeolites
KnownOpRhs
Zeolitic
POSIX
CaCO
�ngstr�m
pcre
PCRE
crossref
renormalize
structs
Lausanne
backend
perovskites
OPTiMaDe
optimade
sortable
CECAM
IANA
xml
NaCl
urls
bandgap
http
Punctuator
pre
zeo
denox
deNOx
zeo
json
JSON
calc
288 changes: 153 additions & 135 deletions optimade.rst
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/cases/Filter_028.inp
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../inputs/length3_fail.filter
../inputs/length3.filter
2 changes: 1 addition & 1 deletion tests/inputs/length.filter
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LENGTH elements = 42 AND LENGTH elements > 42 AND LENGTH elements < 42 AND LENGTH elements != 42 AND LENGTH elements >= 42 AND LENGTH elements <= 42
elements LENGTH = 42 AND elements LENGTH > 42 AND elements LENGTH < 42 AND elements LENGTH != 42 AND elements LENGTH >= 42 AND elements LENGTH <= 42
2 changes: 1 addition & 1 deletion tests/inputs/length2.filter
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LENGTH elements = "42"
elements LENGTH = "42"
2 changes: 1 addition & 1 deletion tests/inputs/length2_fail.filter
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LENGTH elements
elements LENGTH
0 tests/inputs/length3_fail.filter → tests/inputs/length3.filter
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/inputs/length4_fail.filter
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LENGTH elements IS 42
elements LENGTH IS 42
2 changes: 1 addition & 1 deletion tests/inputs/length_fail.filter
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LENGTH elements 42
LENGTH elements 42
3 changes: 1 addition & 2 deletions tests/outputs/Filter_015.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ Error: in tests/cases/Filter_015.inp: line 1:
unexpected token "OR", expected one of "NOT", """, "+", "-", "0",
"1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "a", "b", "c",
"d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
"q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "_", "LENGTH",
or "("
"q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "_", or "("

chemical_formula = "Al" AND OR prototype_formula = "A"
^
18 changes: 11 additions & 7 deletions tests/outputs/Filter_019.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,14 @@ Filter(9999)
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 26
Error: in tests/cases/Filter_019.inp: line 1:
unexpected token "4", expected one of """, "a", "b", "c", "d",
"e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q",
"r", "s", "t", "u", "v", "w", "x", "y", "z", or "_"

chemical_formula CONTAINS 42
^
Value(9999)
Number(9999)
Digits(9999)
Digit(9999)
TOKEN_20(9999): "4", line: 1, col: 27
Digit(9999)
TOKEN_18(9999): "2", line: 1, col: 28
Spaces(9999)
Space(9999)
nl(9999)
SPECIAL_1(9999): "(...)", line: 1, col: 29
3 changes: 2 additions & 1 deletion tests/outputs/Filter_020.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Filter(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 26
Error: in tests/cases/Filter_020.inp: line 1:
unexpected token "STARTS", expected one of """, "a", "b", "c",
unexpected token "STARTS", expected one of """, "+", "-", "0",
"1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "a", "b", "c",
"d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
"q", "r", "s", "t", "u", "v", "w", "x", "y", "z", or "_"

Expand Down
6 changes: 3 additions & 3 deletions tests/outputs/Filter_021.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Filter(9999)
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 26
StringProperty(9999)
Value(9999)
String(9999)
TOKEN_3(9999): """, line: 1, col: 27
EscapedChar(9999)
Expand Down Expand Up @@ -117,7 +117,7 @@ Filter(9999)
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 59
StringProperty(9999)
Value(9999)
String(9999)
TOKEN_3(9999): """, line: 1, col: 60
EscapedChar(9999)
Expand Down Expand Up @@ -186,7 +186,7 @@ Filter(9999)
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 90
StringProperty(9999)
Value(9999)
String(9999)
TOKEN_3(9999): """, line: 1, col: 91
EscapedChar(9999)
Expand Down
2 changes: 1 addition & 1 deletion tests/outputs/Filter_022.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Filter(9999)
TOKEN_1(9999): " ", line: 1, col: 18
Error: in tests/cases/Filter_022.inp: line 1:
unexpected token "UNKNOWN", expected one of "<", ">", "!", "=",
"IS", "CONTAINS", "STARTS", "ENDS", "HAS", or ":"
"IS", "CONTAINS", "STARTS", "ENDS", "HAS", ":", or "LENGTH"

prototype_formula UNKNOWN
^
2 changes: 1 addition & 1 deletion tests/outputs/Filter_023.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Filter(9999)
TOKEN_1(9999): " ", line: 1, col: 9
Error: in tests/cases/Filter_023.inp: line 1:
unexpected token "f", expected one of "<", ">", "!", "=", "IS",
"CONTAINS", "STARTS", "ENDS", "HAS", or ":"
"CONTAINS", "STARTS", "ENDS", "HAS", ":", or "LENGTH"

chemical formula IS KNOWN 42
^
Expand Down
2 changes: 1 addition & 1 deletion tests/outputs/Filter_024.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Filter(9999)
TOKEN_1(9999): " ", line: 1, col: 17
Error: in tests/cases/Filter_024.inp: line 1:
unexpected token "KNOWN", expected one of "<", ">", "!", "=",
"IS", "CONTAINS", "STARTS", "ENDS", "HAS", or ":"
"IS", "CONTAINS", "STARTS", "ENDS", "HAS", ":", or "LENGTH"

chemical_formula KNOWN
^
33 changes: 17 additions & 16 deletions tests/outputs/Filter_026.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,34 @@ Filter(9999)
Expression(9999)
ExpressionClause(9999)
ExpressionPhrase(9999)
PredicateComparison(9999)
LengthComparison(9999)
LENGTH(9999)
TOKEN_53(9999): "LENGTH", line: 1, col: 1
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 7
Comparison(9999)
PropertyFirstComparison(9999)
Property(9999)
Identifier(9999)
LowercaseLetter(9999)
TOKEN_84(9999): "e", line: 1, col: 8
TOKEN_84(9999): "e", line: 1, col: 1
LowercaseLetter(9999)
TOKEN_91(9999): "l", line: 1, col: 9
TOKEN_91(9999): "l", line: 1, col: 2
LowercaseLetter(9999)
TOKEN_84(9999): "e", line: 1, col: 10
TOKEN_84(9999): "e", line: 1, col: 3
LowercaseLetter(9999)
TOKEN_92(9999): "m", line: 1, col: 11
TOKEN_92(9999): "m", line: 1, col: 4
LowercaseLetter(9999)
TOKEN_84(9999): "e", line: 1, col: 12
TOKEN_84(9999): "e", line: 1, col: 5
LowercaseLetter(9999)
TOKEN_93(9999): "n", line: 1, col: 13
TOKEN_93(9999): "n", line: 1, col: 6
LowercaseLetter(9999)
TOKEN_99(9999): "t", line: 1, col: 14
TOKEN_99(9999): "t", line: 1, col: 7
LowercaseLetter(9999)
TOKEN_98(9999): "s", line: 1, col: 15
TOKEN_98(9999): "s", line: 1, col: 8
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 9
LengthOpRhs(9999)
LENGTH(9999)
TOKEN_53(9999): "LENGTH", line: 1, col: 10
Error: in tests/cases/Filter_026.inp: line 1:
unexpected end of file

LENGTH elements
elements LENGTH
^
65 changes: 33 additions & 32 deletions tests/outputs/Filter_027.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,49 @@ Filter(9999)
Expression(9999)
ExpressionClause(9999)
ExpressionPhrase(9999)
PredicateComparison(9999)
LengthComparison(9999)
LENGTH(9999)
TOKEN_53(9999): "LENGTH", line: 1, col: 1
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 7
Comparison(9999)
PropertyFirstComparison(9999)
Property(9999)
Identifier(9999)
LowercaseLetter(9999)
TOKEN_84(9999): "e", line: 1, col: 8
TOKEN_84(9999): "e", line: 1, col: 1
LowercaseLetter(9999)
TOKEN_91(9999): "l", line: 1, col: 9
TOKEN_91(9999): "l", line: 1, col: 2
LowercaseLetter(9999)
TOKEN_84(9999): "e", line: 1, col: 10
TOKEN_84(9999): "e", line: 1, col: 3
LowercaseLetter(9999)
TOKEN_92(9999): "m", line: 1, col: 11
TOKEN_92(9999): "m", line: 1, col: 4
LowercaseLetter(9999)
TOKEN_84(9999): "e", line: 1, col: 12
TOKEN_84(9999): "e", line: 1, col: 5
LowercaseLetter(9999)
TOKEN_93(9999): "n", line: 1, col: 13
TOKEN_93(9999): "n", line: 1, col: 6
LowercaseLetter(9999)
TOKEN_99(9999): "t", line: 1, col: 14
TOKEN_99(9999): "t", line: 1, col: 7
LowercaseLetter(9999)
TOKEN_98(9999): "s", line: 1, col: 15
TOKEN_98(9999): "s", line: 1, col: 8
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 9
LengthOpRhs(9999)
LENGTH(9999)
TOKEN_53(9999): "LENGTH", line: 1, col: 10
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 16
Operator(9999)
TOKEN_29(9999): "=", line: 1, col: 17
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 18
Value(9999)
String(9999)
TOKEN_3(9999): """, line: 1, col: 19
EscapedChar(9999)
UnescapedChar(9999)
Digit(9999)
TOKEN_20(9999): "4", line: 1, col: 20
EscapedChar(9999)
UnescapedChar(9999)
Digit(9999)
TOKEN_18(9999): "2", line: 1, col: 21
TOKEN_3(9999): """, line: 1, col: 22
Operator(9999)
TOKEN_29(9999): "=", line: 1, col: 17
Spaces(9999)
Space(9999)
TOKEN_1(9999): " ", line: 1, col: 18
Value(9999)
String(9999)
TOKEN_3(9999): """, line: 1, col: 19
EscapedChar(9999)
UnescapedChar(9999)
Digit(9999)
TOKEN_20(9999): "4", line: 1, col: 20
EscapedChar(9999)
UnescapedChar(9999)
Digit(9999)
TOKEN_18(9999): "2", line: 1, col: 21
TOKEN_3(9999): """, line: 1, col: 22
Loading

0 comments on commit 543b0fc

Please sign in to comment.