diff options
| author | Paul McGuire <ptmcg@austin.rr.com> | 2015-12-30 15:10:14 +0000 |
|---|---|---|
| committer | Paul McGuire <ptmcg@austin.rr.com> | 2015-12-30 15:10:14 +0000 |
| commit | c8e8c6592d625d24bc7c0ca34bcc527ec380c2d5 (patch) | |
| tree | d3214109b0d651b19fb9a5c503dc2968db7f7357 /src | |
| parent | 5055f45e69d3aa1014bc9b0ab1e4641ac0413c09 (diff) | |
| download | pyparsing-git-c8e8c6592d625d24bc7c0ca34bcc527ec380c2d5.tar.gz | |
Remove list comprehensions in favor of gen exprs
Diffstat (limited to 'src')
| -rw-r--r-- | src/examples/chemicalFormulas.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/examples/chemicalFormulas.py b/src/examples/chemicalFormulas.py index e7d7757..ce66afd 100644 --- a/src/examples/chemicalFormulas.py +++ b/src/examples/chemicalFormulas.py @@ -37,7 +37,7 @@ element = Word( alphas.upper(), alphas.lower(), max=2) elementRef = Group( element + Optional( Word( digits ), default="1" ) )
formula = OneOrMore( elementRef )
-fn = lambda elemList : sum( [ atomicWeight[elem]*int(qty) for elem,qty in elemList ] )
+fn = lambda elemList : sum(atomicWeight[elem]*int(qty) for elem,qty in elemList)
test( formula, "H2O", fn )
test( formula, "C6H5OH", fn )
test( formula, "NaCl", fn )
@@ -47,7 +47,7 @@ print() elementRef = Group( element("symbol") + Optional( Word( digits ), default="1" )("qty") )
formula = OneOrMore( elementRef )
-fn = lambda elemList : sum( [ atomicWeight[elem.symbol]*int(elem.qty) for elem in elemList ] )
+fn = lambda elemList : sum(atomicWeight[elem.symbol]*int(elem.qty) for elem in elemList)
test( formula, "H2O", fn )
test( formula, "C6H5OH", fn )
test( formula, "NaCl", fn )
@@ -58,7 +58,7 @@ integer = Word( digits ).setParseAction(lambda t:int(t[0])) elementRef = Group( element("symbol") + Optional( integer, default=1 )("qty") )
formula = OneOrMore( elementRef )
-fn = lambda elemList : sum( [ atomicWeight[elem.symbol]*elem.qty for elem in elemList ] )
+fn = lambda elemList : sum(atomicWeight[elem.symbol]*elem.qty for elem in elemList)
test( formula, "H2O", fn )
test( formula, "C6H5OH", fn )
test( formula, "NaCl", fn )
|