summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/spack/docs/basic_usage.rst17
-rw-r--r--lib/spack/docs/features.rst2
-rw-r--r--lib/spack/docs/getting_started.rst2
-rw-r--r--lib/spack/docs/tutorial_sc16_spack_basics.rst20
-rw-r--r--lib/spack/spack/cmd/__init__.py3
-rw-r--r--lib/spack/spack/cmd/install.py66
-rw-r--r--lib/spack/spack/parse.py56
-rw-r--r--lib/spack/spack/spec.py80
-rw-r--r--lib/spack/spack/test/spec_syntax.py109
9 files changed, 246 insertions, 109 deletions
diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst
index 7ec61334db..f25247579b 100644
--- a/lib/spack/docs/basic_usage.rst
+++ b/lib/spack/docs/basic_usage.rst
@@ -647,8 +647,8 @@ avoid ambiguity.
When spack normalizes specs, it prints them out with no spaces boolean
variants using the backwards compatibility syntax and uses only ``~``
-for disabled boolean variants. We allow ``-`` and spaces on the command
-line is provided for convenience and legibility.
+for disabled boolean variants. The ``-`` and spaces on the command
+line are provided for convenience and legibility.
^^^^^^^^^^^^^^
Compiler Flags
@@ -658,14 +658,17 @@ Compiler flags are specified using the same syntax as non-boolean variants,
but fulfill a different purpose. While the function of a variant is set by
the package, compiler flags are used by the compiler wrappers to inject
flags into the compile line of the build. Additionally, compiler flags are
-inherited by dependencies. ``spack install libdwarf cppflags=\"-g\"`` will
+inherited by dependencies. ``spack install libdwarf cppflags="-g"`` will
install both libdwarf and libelf with the ``-g`` flag injected into their
compile line.
-Notice that the value of the compiler flags must be escape quoted on the
-command line. From within python files, the same spec would be specified
-``libdwarf cppflags="-g"``. This is necessary because of how the shell
-handles the quote symbols.
+Notice that the value of the compiler flags must be quoted if it
+contains any spaces. Any of ``cppflags=-O3``, ``cppflags="-O3"``,
+``cppflags='-O3'``, and ``cppflags="-O3 -fPIC"`` are acceptable, but
+``cppflags=-O3 -fPIC`` is not. Additionally, if they value of the
+compiler flags is not the last thing on the line, it must be followed
+by a space. The commmand ``spack install libelf cppflags="-O3"%intel``
+will be interpreted as an attempt to set `cppflags="-O3%intel"``.
The six compiler flags are injected in the order of implicit make commands
in GNU Autotools. If all flags are set, the order is
diff --git a/lib/spack/docs/features.rst b/lib/spack/docs/features.rst
index 2df1d182d6..8d7c1ec0cd 100644
--- a/lib/spack/docs/features.rst
+++ b/lib/spack/docs/features.rst
@@ -41,7 +41,7 @@ platform, all on the command line.
$ spack install mpileaks@1.1.2 %gcc@4.7.3 +debug
# Add compiler flags using the conventional names
- $ spack install mpileaks@1.1.2 %gcc@4.7.3 cppflags=\"-O3 -floop-block\"
+ $ spack install mpileaks@1.1.2 %gcc@4.7.3 cppflags="-O3 -floop-block"
# Cross-compile for a different architecture with arch=
$ spack install mpileaks@1.1.2 arch=bgqos_0
diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst
index 8e5ee7f379..efc1965ce9 100644
--- a/lib/spack/docs/getting_started.rst
+++ b/lib/spack/docs/getting_started.rst
@@ -632,7 +632,7 @@ the command line:
.. code-block:: console
- $ spack install openmpi fflags=\"-mismatch\"
+ $ spack install openmpi fflags="-mismatch"
Or it can be set permanently in your ``compilers.yaml``:
diff --git a/lib/spack/docs/tutorial_sc16_spack_basics.rst b/lib/spack/docs/tutorial_sc16_spack_basics.rst
index 532410058d..9511907ceb 100644
--- a/lib/spack/docs/tutorial_sc16_spack_basics.rst
+++ b/lib/spack/docs/tutorial_sc16_spack_basics.rst
@@ -184,15 +184,15 @@ compilers.
[+] ~/spack/opt/spack/linux-redhat6-x86_64/intel-15.0.4/libelf-0.8.13-w33hrejdyqu2j2gggdswitls2zv6kdsi
-The spec syntax also includes compiler flags. Spack accepts ``cppflags``,
-``cflags``, ``cxxflags``, ``fflags``, ``ldflags``, and ``ldlibs``
-parameters. The values of these fields must be escape-quoted with ``\"``
-on the command line. These values are injected into the compile line
-automatically by the Spack compiler wrappers.
+The spec syntax also includes compiler flags. Spack accepts
+``cppflags``, ``cflags``, ``cxxflags``, ``fflags``, ``ldflags``, and
+``ldlibs`` parameters. The values of these fields must be quoted on
+the command line if they include spaces. These values are injected
+into the compile line automatically by the Spack compiler wrappers.
.. code-block:: console
- $ spack install libelf @0.8.12 cppflags=\"-O3\"
+ $ spack install libelf @0.8.12 cppflags="-O3"
==> Installing libelf
==> Trying to fetch from ~/spack/var/spack/cache/libelf/libelf-0.8.12.tar.gz
################################################################################################################################################################################# 100.0%
@@ -309,7 +309,7 @@ top-level package, we can also specify about a dependency using ``^``.
Packages can also be referred to from the command line by their package
hash. Using the ``spack find -lf`` command earlier we saw that the hash
-of our optimized installation of libelf (``cppflags=\"-O3\"``) began with
+of our optimized installation of libelf (``cppflags="-O3"``) began with
``vrv2ttb``. We can now explicitly build with that package without typing
the entire spec, by using the ``/`` sigil to refer to it by hash. As with
other tools like git, you do not need to specify an *entire* hash on the
@@ -1103,8 +1103,8 @@ already covered in the :ref:`basics-tutorial-install` and
The ``spack find`` command can accept what we call "anonymous specs."
These are expressions in spec syntax that do not contain a package
name. For example, `spack find %intel` will return every package built
-with the intel compiler, and ``spack find cppflags=\\"-O3\\"`` will
-return every package which was built with ``cppflags=\\"-O3\\"``.
+with the intel compiler, and ``spack find cppflags="-O3"`` will
+return every package which was built with ``cppflags="-O3"``.
.. code-block:: console
@@ -1115,7 +1115,7 @@ return every package which was built with ``cppflags=\\"-O3\\"``.
- $ spack find cppflags=\"-O3\"
+ $ spack find cppflags="-O3"
==> 1 installed packages.
-- linux-redhat6-x86_64 / gcc@4.4.7 -----------------------------
libelf@0.8.12
diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py
index 3e83dbb789..6fa0883014 100644
--- a/lib/spack/spack/cmd/__init__.py
+++ b/lib/spack/spack/cmd/__init__.py
@@ -108,9 +108,6 @@ def parse_specs(args, **kwargs):
concretize = kwargs.get('concretize', False)
normalize = kwargs.get('normalize', False)
- if isinstance(args, (python_list, tuple)):
- args = " ".join(args)
-
try:
specs = spack.spec.parse(args)
for spec in specs:
diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py
index 38994790ae..3731fe3c81 100644
--- a/lib/spack/spack/cmd/install.py
+++ b/lib/spack/spack/cmd/install.py
@@ -315,36 +315,36 @@ def install(parser, args, **kwargs):
# Spec from cli
specs = spack.cmd.parse_specs(args.package, concretize=True)
- if len(specs) != 1:
- tty.error('only one spec can be installed at a time.')
- spec = specs.pop()
-
- # Check if we were asked to produce some log for dashboards
- if args.log_format is not None:
- # Compute the filename for logging
- log_filename = args.log_file
- if not log_filename:
- log_filename = default_log_file(spec)
- # Create the test suite in which to log results
- test_suite = TestSuite(spec)
- # Decorate PackageBase.do_install to get installation status
- PackageBase.do_install = junit_output(
- spec, test_suite
- )(PackageBase.do_install)
-
- # Do the actual installation
- if args.things_to_install == 'dependencies':
- # Install dependencies as-if they were installed
- # for root (explicit=False in the DB)
- kwargs['explicit'] = False
- for s in spec.dependencies():
- p = spack.repo.get(s)
- p.do_install(**kwargs)
- else:
- package = spack.repo.get(spec)
- kwargs['explicit'] = True
- package.do_install(**kwargs)
-
- # Dump log file if asked to
- if args.log_format is not None:
- test_suite.dump(log_filename)
+ if len(specs) == 0:
+ tty.error('The `spack install` command requires a spec to install.')
+
+ for spec in specs:
+ # Check if we were asked to produce some log for dashboards
+ if args.log_format is not None:
+ # Compute the filename for logging
+ log_filename = args.log_file
+ if not log_filename:
+ log_filename = default_log_file(spec)
+ # Create the test suite in which to log results
+ test_suite = TestSuite(spec)
+ # Decorate PackageBase.do_install to get installation status
+ PackageBase.do_install = junit_output(
+ spec, test_suite
+ )(PackageBase.do_install)
+
+ # Do the actual installation
+ if args.things_to_install == 'dependencies':
+ # Install dependencies as-if they were installed
+ # for root (explicit=False in the DB)
+ kwargs['explicit'] = False
+ for s in spec.dependencies():
+ p = spack.repo.get(s)
+ p.do_install(**kwargs)
+ else:
+ package = spack.repo.get(spec)
+ kwargs['explicit'] = True
+ package.do_install(**kwargs)
+
+ # Dump log file if asked to
+ if args.log_format is not None:
+ test_suite.dump(log_filename)
diff --git a/lib/spack/spack/parse.py b/lib/spack/spack/parse.py
index 1b88db2d7c..e116175823 100644
--- a/lib/spack/spack/parse.py
+++ b/lib/spack/spack/parse.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import re
+import shlex
import itertools
import spack.error
@@ -53,19 +54,56 @@ class Token:
class Lexer(object):
"""Base class for Lexers that keep track of line numbers."""
- def __init__(self, lexicon):
- self.scanner = re.Scanner(lexicon)
+ def __init__(self, lexicon0, mode_switches_01=[],
+ lexicon1=[], mode_switches_10=[]):
+ self.scanner0 = re.Scanner(lexicon0)
+ self.mode_switches_01 = mode_switches_01
+ self.scanner1 = re.Scanner(lexicon1)
+ self.mode_switches_10 = mode_switches_10
+ self.mode = 0
def token(self, type, value=''):
- return Token(type, value,
- self.scanner.match.start(0), self.scanner.match.end(0))
+ if self.mode == 0:
+ return Token(type, value,
+ self.scanner0.match.start(0),
+ self.scanner0.match.end(0))
+ else:
+ return Token(type, value,
+ self.scanner1.match.start(0),
+ self.scanner1.match.end(0))
+
+ def lex_word(self, word):
+ scanner = self.scanner0
+ mode_switches = self.mode_switches_01
+ if self.mode == 1:
+ scanner = self.scanner1
+ mode_switches = self.mode_switches_10
+
+ tokens, remainder = scanner.scan(word)
+ remainder_used = 0
+
+ for i, t in enumerate(tokens):
+ if t.type in mode_switches:
+ # Combine post-switch tokens with remainder and
+ # scan in other mode
+ self.mode = 1 - self.mode # swap 0/1
+ remainder_used = 1
+ tokens = tokens[:i + 1] + self.lex_word(
+ word[word.index(t.value) + len(t.value):])
+ break
+
+ if remainder and not remainder_used:
+ raise LexError("Invalid character", word, word.index(remainder))
- def lex(self, text):
- tokens, remainder = self.scanner.scan(text)
- if remainder:
- raise LexError("Invalid character", text, text.index(remainder))
return tokens
+ def lex(self, text):
+ lexed = []
+ for word in text:
+ tokens = self.lex_word(word)
+ lexed.extend(tokens)
+ return lexed
+
class Parser(object):
"""Base class for simple recursive descent parsers."""
@@ -121,6 +159,8 @@ class Parser(object):
sys.exit(1)
def setup(self, text):
+ if isinstance(text, basestring):
+ text = shlex.split(text)
self.text = text
self.push_tokens(self.lexer.lex(text))
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 8c6dd36c84..e34f2b799d 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -614,7 +614,7 @@ class VariantSpec(object):
if type(self.value) == bool:
return '{0}{1}'.format('+' if self.value else '~', self.name)
else:
- return ' {0}={1}'.format(self.name, self.value)
+ return ' {0}={1} '.format(self.name, self.value)
class VariantMap(HashableMap):
@@ -731,7 +731,8 @@ class FlagMap(HashableMap):
cond_symbol = ' ' if len(sorted_keys) > 0 else ''
return cond_symbol + ' '.join(
str(key) + '=\"' + ' '.join(
- str(f) for f in self[key]) + '\"' for key in sorted_keys)
+ str(f) for f in self[key]) + '\"'
+ for key in sorted_keys) + cond_symbol
class DependencyMap(HashableMap):
@@ -2447,7 +2448,8 @@ class Spec(object):
write(fmt % str(self.variants), c)
elif c == '=':
if self.architecture and str(self.architecture):
- write(fmt % (' arch' + c + str(self.architecture)), c)
+ a_str = ' arch' + c + str(self.architecture) + ' '
+ write(fmt % (a_str), c)
elif c == '#':
out.write('-' + fmt % (self.dag_hash(7)))
elif c == '$':
@@ -2506,7 +2508,7 @@ class Spec(object):
write(fmt % str(self.variants), '+')
elif named_str == 'ARCHITECTURE':
if self.architecture and str(self.architecture):
- write(fmt % str(self.architecture), ' arch=')
+ write(fmt % str(self.architecture) + ' ', ' arch=')
elif named_str == 'SHA1':
if self.dependencies:
out.write(fmt % str(self.dag_hash(7)))
@@ -2576,7 +2578,8 @@ class Spec(object):
return 0
def __str__(self):
- return self.format() + self.dep_string()
+ ret = self.format() + self.dep_string()
+ return ret.strip()
def _install_status(self):
"""Helper for tree to print DB install status."""
@@ -2650,7 +2653,7 @@ class Spec(object):
#
# These are possible token types in the spec grammar.
#
-HASH, DEP, AT, COLON, COMMA, ON, OFF, PCT, EQ, QT, ID = range(11)
+HASH, DEP, AT, COLON, COMMA, ON, OFF, PCT, EQ, ID, VAL = range(11)
class SpecLexer(spack.parse.Lexer):
@@ -2671,10 +2674,12 @@ class SpecLexer(spack.parse.Lexer):
(r'\=', lambda scanner, val: self.token(EQ, val)),
# This is more liberal than identifier_re (see above).
# Checked by check_identifier() for better error messages.
- (r'([\"\'])(?:(?=(\\?))\2.)*?\1',
- lambda scanner, val: self.token(QT, val)),
(r'\w[\w.-]*', lambda scanner, val: self.token(ID, val)),
- (r'\s+', lambda scanner, val: None)])
+ (r'\s+', lambda scanner, val: None)],
+ [EQ],
+ [(r'[\S].*', lambda scanner, val: self.token(VAL, val)),
+ (r'\s+', lambda scanner, val: None)],
+ [VAL])
# Lexer is always the same for every parser.
@@ -2689,36 +2694,49 @@ class SpecParser(spack.parse.Parser):
def do_parse(self):
specs = []
+
try:
- while self.next:
+ while self.next or self.previous:
# TODO: clean this parsing up a bit
if self.previous:
+ # We picked up the name of this spec while finishing the
+ # previous spec
specs.append(self.spec(self.previous.value))
- if self.accept(ID):
+ self.previous = None
+ elif self.accept(ID):
self.previous = self.token
if self.accept(EQ):
+ # We're either parsing an anonymous spec beginning
+ # with a key-value pair or adding a key-value pair
+ # to the last spec
if not specs:
specs.append(self.spec(None))
- if self.accept(QT):
- self.token.value = self.token.value[1:-1]
- else:
- self.expect(ID)
+ self.expect(VAL)
specs[-1]._add_flag(
self.previous.value, self.token.value)
+ self.previous = None
else:
- specs.append(self.spec(self.previous.value))
- self.previous = None
+ # We're parsing a new spec by name
+ value = self.previous.value
+ self.previous = None
+ specs.append(self.spec(value))
elif self.accept(HASH):
+ # We're finding a spec by hash
specs.append(self.spec_by_hash())
elif self.accept(DEP):
if not specs:
+ # We're parsing an anonymous spec beginning with a
+ # dependency
self.previous = self.token
specs.append(self.spec(None))
self.previous = None
if self.accept(HASH):
+ # We're finding a dependency by hash for an anonymous
+ # spec
dep = self.spec_by_hash()
else:
+ # We're adding a dependency to the last spec
self.expect(ID)
dep = self.spec(self.token.value)
@@ -2727,11 +2745,12 @@ class SpecParser(spack.parse.Parser):
specs[-1]._add_dependency(dep, ())
else:
- # Attempt to construct an anonymous spec, but check that
- # the first token is valid
- # TODO: Is this check even necessary, or will it all be Lex
- # errors now?
- specs.append(self.spec(None, True))
+ # If the next token can be part of a valid anonymous spec,
+ # create the anonymous spec
+ if self.next.type in (AT, ON, OFF, PCT):
+ specs.append(self.spec(None))
+ else:
+ self.unexpected_token()
except spack.parse.ParseError as e:
raise SpecParseError(e)
@@ -2768,7 +2787,7 @@ class SpecParser(spack.parse.Parser):
return matches[0]
- def spec(self, name, check_valid_token=False):
+ def spec(self, name):
"""Parse a spec out of the input. If a spec is supplied, then initialize
and return it instead of creating a new one."""
if name:
@@ -2819,35 +2838,28 @@ class SpecParser(spack.parse.Parser):
for version in vlist:
spec._add_version(version)
added_version = True
- check_valid_token = False
elif self.accept(ON):
spec._add_variant(self.variant(), True)
- check_valid_token = False
elif self.accept(OFF):
spec._add_variant(self.variant(), False)
- check_valid_token = False
elif self.accept(PCT):
spec._set_compiler(self.compiler())
- check_valid_token = False
elif self.accept(ID):
self.previous = self.token
if self.accept(EQ):
- if self.accept(QT):
- self.token.value = self.token.value[1:-1]
- else:
- self.expect(ID)
+ # We're adding a key-value pair to the spec
+ self.expect(VAL)
spec._add_flag(self.previous.value, self.token.value)
self.previous = None
else:
- return spec
+ # We've found the start of a new spec. Go back to do_parse
+ break
else:
- if check_valid_token:
- self.unexpected_token()
break
# If there was no version in the spec, consier it an open range
diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py
index 3cf094f25a..043d9b176f 100644
--- a/lib/spack/spack/test/spec_syntax.py
+++ b/lib/spack/spack/test/spec_syntax.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import pytest
+import shlex
import spack.spec as sp
from spack.parse import Token
@@ -53,6 +54,34 @@ complex_lex = [Token(sp.ID, 'mvapich_foo'),
Token(sp.AT),
Token(sp.ID, '8.1_1e')]
+# Another sample lexer output with a kv pair.
+kv_lex = [Token(sp.ID, 'mvapich_foo'),
+ Token(sp.ID, 'debug'),
+ Token(sp.EQ),
+ Token(sp.VAL, '4'),
+ Token(sp.DEP),
+ Token(sp.ID, '_openmpi'),
+ Token(sp.AT),
+ Token(sp.ID, '1.2'),
+ Token(sp.COLON),
+ Token(sp.ID, '1.4'),
+ Token(sp.COMMA),
+ Token(sp.ID, '1.6'),
+ Token(sp.PCT),
+ Token(sp.ID, 'intel'),
+ Token(sp.AT),
+ Token(sp.ID, '12.1'),
+ Token(sp.COLON),
+ Token(sp.ID, '12.6'),
+ Token(sp.ON),
+ Token(sp.ID, 'debug'),
+ Token(sp.OFF),
+ Token(sp.ID, 'qt_4'),
+ Token(sp.DEP),
+ Token(sp.ID, 'stackwalker'),
+ Token(sp.AT),
+ Token(sp.ID, '8.1_1e')]
+
class TestSpecSyntax(object):
# ========================================================================
@@ -81,9 +110,10 @@ class TestSpecSyntax(object):
def check_lex(self, tokens, spec):
"""Check that the provided spec parses to the provided token list."""
+ spec = shlex.split(spec)
lex_output = sp.SpecLexer().lex(spec)
for tok, spec_tok in zip(tokens, lex_output):
- if tok.type == sp.ID:
+ if tok.type == sp.ID or tok.type == sp.VAL:
assert tok == spec_tok
else:
# Only check the type for non-identifiers.
@@ -112,10 +142,19 @@ class TestSpecSyntax(object):
self.check_parse("openmpi^hwloc@:1.4b7-rc3")
self.check_parse("openmpi^hwloc@1.2e6:1.4b7-rc3")
- @pytest.mark.xfail
def test_multiple_specs(self):
self.check_parse("mvapich emacs")
+ def test_multiple_specs_after_kv(self):
+ self.check_parse('mvapich cppflags="-O3 -fPIC" emacs')
+ self.check_parse('mvapich cflags="-O3" emacs',
+ 'mvapich cflags=-O3 emacs')
+
+ def test_multiple_specs_long_second(self):
+ self.check_parse('mvapich emacs@1.1.1%intel cflags="-O3"',
+ 'mvapich emacs @1.1.1 %intel cflags=-O3')
+ self.check_parse('mvapich cflags="-O3 -fPIC" emacs^ncurses%intel')
+
def test_full_specs(self):
self.check_parse(
"mvapich_foo"
@@ -123,15 +162,15 @@ class TestSpecSyntax(object):
"^stackwalker@8.1_1e")
self.check_parse(
"mvapich_foo"
- "^_openmpi@1.2:1.4,1.6%intel@12.1 debug=2~qt_4"
+ "^_openmpi@1.2:1.4,1.6%intel@12.1 debug=2 ~qt_4"
"^stackwalker@8.1_1e")
self.check_parse(
'mvapich_foo'
- '^_openmpi@1.2:1.4,1.6%intel@12.1 cppflags="-O3"+debug~qt_4'
+ '^_openmpi@1.2:1.4,1.6%intel@12.1 cppflags="-O3" +debug~qt_4'
'^stackwalker@8.1_1e')
self.check_parse(
"mvapich_foo"
- "^_openmpi@1.2:1.4,1.6%intel@12.1 debug=2~qt_4"
+ "^_openmpi@1.2:1.4,1.6%intel@12.1 debug=2 ~qt_4"
"^stackwalker@8.1_1e arch=test-redhat6-x86_32")
def test_canonicalize(self):
@@ -158,19 +197,19 @@ class TestSpecSyntax(object):
"x ^y~f+e~d+c~b+a@4,2:3,1%intel@4,3,2,1")
self.check_parse(
- "x arch=test-redhat6-None"
- "^y arch=test-None-x86_64"
+ "x arch=test-redhat6-None "
+ "^y arch=test-None-x86_64 "
"^z arch=linux-None-None",
- "x os=fe"
- "^y target=be"
+ "x os=fe "
+ "^y target=be "
"^z platform=linux")
self.check_parse(
- "x arch=test-debian6-x86_64"
+ "x arch=test-debian6-x86_64 "
"^y arch=test-debian6-x86_64",
- "x os=default_os target=default_target"
+ "x os=default_os target=default_target "
"^y os=default_os target=default_target")
self.check_parse("x^y", "x@: ^y@:")
@@ -184,7 +223,7 @@ class TestSpecSyntax(object):
'x@1.2+debug+debug',
'x ^y@1.2+debug debug=true',
'x ^y@1.2 debug=false debug=true',
- 'x ^y@1.2 debug=false~debug'
+ 'x ^y@1.2 debug=false ~debug'
]
self._check_raises(DuplicateVariantError, duplicates)
@@ -277,3 +316,49 @@ class TestSpecSyntax(object):
"mvapich_foo "
"^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
"^ stackwalker @ 8.1_1e")
+ self.check_lex(
+ complex_lex,
+ "mvapich_foo "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug ~ qt_4 "
+ "^ stackwalker @ 8.1_1e")
+
+ def test_kv_with_quotes(self):
+ self.check_lex(
+ kv_lex,
+ "mvapich_foo debug='4' "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
+ self.check_lex(
+ kv_lex,
+ 'mvapich_foo debug="4" '
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
+ self.check_lex(
+ kv_lex,
+ "mvapich_foo 'debug = 4' "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
+
+ def test_kv_without_quotes(self):
+ self.check_lex(
+ kv_lex,
+ "mvapich_foo debug=4 "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
+
+ def test_kv_with_spaces(self):
+ self.check_lex(
+ kv_lex,
+ "mvapich_foo debug = 4 "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
+ self.check_lex(
+ kv_lex,
+ "mvapich_foo debug =4 "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
+ self.check_lex(
+ kv_lex,
+ "mvapich_foo debug= 4 "
+ "^ _openmpi @1.2 : 1.4 , 1.6 % intel @ 12.1 : 12.6 + debug - qt_4 "
+ "^ stackwalker @ 8.1_1e")
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 15:19:51 +0000