[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-python/python36] parser: Merge branch 'master' into python36
From:       Sven Brauch <mail () svenbrauch ! de>
Date:       2016-11-30 16:13:47
Message-ID: E1cC7Vz-0007fh-EI () code ! kde ! org
[Download RAW message or body]

Git commit 216062e07597af42497c808cffc5d4fd8af1afa9 by Sven Brauch.
Committed on 30/11/2016 at 16:13.
Pushed by brauch into branch 'python36'.

Merge branch 'master' into python36

M  +1    -1    parser/ast.cpp
M  +0    -1    parser/ast.h
M  +0    -1    parser/generated.h
R  +1    -1    parser/python36.sdef

https://commits.kde.org/kdev-python/216062e07597af42497c808cffc5d4fd8af1afa9

diff --cc parser/python36.sdef
index 059bf69,7b9ffcb..8a1d6d2
--- a/parser/python36.sdef
+++ b/parser/python36.sdef
@@@ -51,11 -50,9 +51,11 @@@ RULE_FOR _expr;KIND DictComp_kind;ACTIO
  RULE_FOR _expr;KIND GeneratorExp_kind;ACTIONS create|GeneratorExpressionAst \
set|element->ExpressionAst,elt set|generators=>ComprehensionAst,generators;;  \
RULE_FOR _expr;KIND Yield_kind;ACTIONS create|YieldAst \
set|value->ExpressionAst,value;;  RULE_FOR _expr;KIND Compare_kind;ACTIONS \
create|CompareAst set|leftmostElement->ExpressionAst,left \
set|operators#>ComparisonOperatorTypes,ops \
                set|comparands=>ExpressionAst,comparators;;
- RULE_FOR _expr;KIND Call_kind;ACTIONS create|CallAst \
set|function->ExpressionAst,func set|arguments=>ExpressionAst,args \
set|keywords=>KeywordAst,keywords;CODE v->function->belongsToCall = v;; + RULE_FOR \
_expr;KIND Call_kind;ACTIONS create|CallAst set|function->ExpressionAst,func \
set|arguments=>ExpressionAst,args set|keywords=>KeywordAst,keywords;;  RULE_FOR \
_expr;KIND Num_kind;ACTIONS create|NumberAst;CODE v->isInt = \
PyLong_Check(node->v.Num.n); v->value = PyLong_AsLong(node->v.Num.n);;  RULE_FOR \
_expr;KIND Str_kind;ACTIONS create|StringAst set|value$>s;;  +RULE_FOR _expr;KIND \
JoinedStr_kind;ACTIONS create|JoinedStringAst set|values=>ExpressionAst,values;;  \
+RULE_FOR _expr;KIND FormattedValue_kind;ACTIONS create|FormattedValueAst \
set|value->ExpressionAst,value set|conversion:>conversion \
set|formatSpec->ExpressionAst,format_spec;;  RULE_FOR _expr;KIND Bytes_kind;ACTIONS \
create|BytesAst set|value$>s;;  RULE_FOR _expr;KIND Attribute_kind;ACTIONS \
create|AttributeAst set|attribute~>attr set|value->ExpressionAst,value \
set|context*>Context,ctx;;  RULE_FOR _expr;KIND Subscript_kind;ACTIONS \
create|SubscriptAst set|value->ExpressionAst,value set|slice->SliceAst,slice \
set|context*>Context,ctx;;


[prev in list] [next in list] [prev in thread] [next in thread]