Wiki
Show
Ignore:
Timestamp:
03/15/10 11:05:59 (2 years ago)
Author:
Chuck.Esterbrook
Message:

Code cleanup.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • cobra/trunk/Source/Expr.cobra

    r2319 r2320  
    4343 
    4444class Expr inherits Stmt implements IExpr is abstract, partial 
    45     """ 
    46     TODO: Add a .subexpressions iterator which can then be used by .hasError, .willChangeVar and possibly others. 
    47     """ 
    4845 
    4946    var _type as IType? 
     
    8986    get definition 
    9087        return nil 
     88 
     89    get hasError as bool is override 
     90        for expr in .allExprs, if expr._innerHasError, return true 
     91        return false 
     92 
     93    get _innerHasError as bool 
     94        return .errors and .errors.count > 0 
    9195 
    9296    get willChangeVar as bool 
     
    352356        _stmts.add(stmt) 
    353357 
    354     get hasError as bool 
    355         return base.hasError or _method.hasError 
     358    get _innerHasError as bool 
     359        return base._innerHasError or _method.hasError 
    356360 
    357361    def _bindImp is override 
     
    373377        _expr = expr 
    374378 
     379    get allExprs as Expr* 
     380        for expr in base.allExprs, yield expr 
     381        for expr in .expr.allExprs, yield expr 
     382 
    375383    get expr from var as Expr 
    376384     
     
    382390        base.addSubFields 
    383391        .addField('expr', .expr) 
    384  
    385     get hasError as bool 
    386         return base.hasError or _expr.hasError 
    387  
    388     get allExprs as Expr* 
    389         for expr in base.allExprs, yield expr 
    390         for expr in .expr.allExprs, yield expr 
    391392 
    392393    def toCobraSource as String is override 
     
    528529        .addField('args', _args) 
    529530 
     531    get allExprs as Expr* 
     532        for expr in base.allExprs, yield expr 
     533        for arg in .args, for expr in arg.allExprs, yield expr 
     534 
    530535    get genericArgProxies from var 
    531536     
    532537    get genericArgTypes from var 
    533  
    534     get hasError as bool 
    535         if base.hasError, return true 
    536         for arg in _args, if arg.hasError, return true 
    537         return false 
    538538 
    539539    get hasParens from var 
     
    554554 
    555555    get memberDefinition from _definition 
    556  
    557     get allExprs as Expr* 
    558         for expr in base.allExprs, yield expr 
    559         for arg in .args, for expr in arg.allExprs, yield expr 
    560556 
    561557    def _bindImp is override 
     
    809805        _members = List<of EnumMember>() 
    810806     
    811     get name from var 
    812      
    813     get args from var 
    814         has Subnodes 
    815      
    816     get definition is override 
    817         return _definition 
    818  
    819     get enumDefinition from _definition 
    820      
    821     get members from _members 
    822      
    823     get hasError as bool is override 
    824         if base.hasError, return true 
    825         for arg in _args, if arg.hasError, return true 
    826         return false 
    827  
    828807    get allExprs as Expr* 
    829808        for expr in base.allExprs, yield expr 
    830809        for arg in .args, for expr in arg.allExprs, yield expr 
    831810 
     811    get name from var 
     812     
     813    get args from var 
     814        has Subnodes 
     815     
     816    get definition is override 
     817        return _definition 
     818 
     819    get enumDefinition from _definition 
     820     
     821    get members from _members 
     822     
    832823    def toCobraSource as String is override 
    833824        sb = StringBuilder() 
     
    898889        .addField('step', _step) 
    899890 
    900     get nameExpr from _nameExpr 
    901  
    902     get what from _what 
    903      
    904     get whereExpr from _whereExpr 
    905  
    906     get getExpr from _getExpr 
    907  
    908     get start from _start 
    909  
    910     get stop from _stop 
    911  
    912     get step from _step 
    913  
    914891    get allExprs as Expr* 
    915892        for expr in base.allExprs, yield expr 
     
    921898        if .stop, for expr in .stop.allExprs, yield expr 
    922899        if .step, for expr in .step.allExprs, yield expr 
     900 
     901    get nameExpr from _nameExpr 
     902 
     903    get what from _what 
     904     
     905    get whereExpr from _whereExpr 
     906 
     907    get getExpr from _getExpr 
     908 
     909    get start from _start 
     910 
     911    get stop from _stop 
     912 
     913    get step from _step 
    923914 
    924915    get willChangeVar as bool is override 
     
    11151106        _cond, _tpart, _fpart = cond, tpart, fpart 
    11161107 
     1108    get allExprs as Expr* 
     1109        for expr in base.allExprs, yield expr 
     1110        for expr in .cond.allExprs, yield expr 
     1111        for expr in .tpart.allExprs, yield expr 
     1112        for expr in .fpart.allExprs, yield expr 
     1113 
    11171114    get cond from var 
    11181115     
     
    11261123        .addField('tpart', .tpart) 
    11271124        .addField('fpart', .fpart) 
    1128  
    1129     get hasError as bool is override 
    1130         if base.hasError, return true 
    1131         if .cond.hasError, return true 
    1132         if .tpart.hasError, return true 
    1133         if .fpart.hasError, return true 
    1134         return false 
    1135  
    1136     get allExprs as Expr* 
    1137         for expr in base.allExprs, yield expr 
    1138         for expr in .cond.allExprs, yield expr 
    1139         for expr in .tpart.allExprs, yield expr 
    1140         for expr in .fpart.allExprs, yield expr 
    11411125 
    11421126    get willChangeVar as bool is override 
     
    12031187        .addField('args', _args) 
    12041188 
    1205     get definition is override 
    1206         return _definition 
    1207  
    1208     get memberDefinition from _definition 
    1209  
    1210     get target from var 
    1211  
    1212     get args from var 
    1213         has Subnodes 
    1214  
    1215     get hasError as bool is override 
    1216         if base.hasError, return true 
    1217         if _target.hasError, return true 
    1218         for arg in _args, if arg.hasError, return true 
    1219         return false 
    1220  
    12211189    get allExprs as Expr* 
    12221190        for expr in base.allExprs, yield expr 
    12231191        for expr in .target.allExprs, yield expr 
    12241192        for arg in .args, for expr in arg.allExprs, yield expr 
     1193 
     1194    get definition is override 
     1195        return _definition 
     1196 
     1197    get memberDefinition from _definition 
     1198 
     1199    get target from var 
     1200 
     1201    get args from var 
     1202        has Subnodes 
    12251203 
    12261204    get willChangeVar as bool is override 
     
    13221300        _expr = expr 
    13231301 
    1324     get hasError as bool is override 
    1325         if base.hasError, return true 
    1326         if _expr.hasError, return true 
    1327         return false 
    1328  
    13291302    get allExprs as Expr* 
    13301303        for expr in base.allExprs, yield expr 
     
    13511324        _expr = expr 
    13521325 
     1326    get allExprs as Expr* 
     1327        for expr in base.allExprs, yield expr 
     1328        for expr in .expr.allExprs, yield expr 
     1329 
    13531330    get expr from var 
    1354  
    1355     get hasError as bool is override 
    1356         if base.hasError, return true 
    1357         if _expr.hasError, return true 
    1358         return false 
    13591331 
    13601332    get willChangeVar as bool is override 
     
    15291501        _expr = expr 
    15301502 
    1531     get expr from var as Expr 
    1532      
    1533     get name as String 
    1534         return 'old' 
    1535  
    1536     get hasError as bool is override 
    1537         if base.hasError, return true 
    1538         if _expr.hasError, return true 
    1539         return false 
    1540  
    15411503    get allExprs as Expr* 
    15421504        for expr in base.allExprs, yield expr 
    15431505        for expr in .expr.allExprs, yield expr 
     1506 
     1507    get expr from var as Expr 
     1508     
     1509    get name as String 
     1510        return 'old' 
    15441511 
    15451512    get willChangeVar as bool is override 
     
    16091576        .addField('isForAttribute', .isForAttribute) 
    16101577 
     1578    get allExprs as Expr* 
     1579        for expr in base.allExprs, yield expr 
     1580        for expr in .expr.allExprs, yield expr 
     1581        for arg in .args, for expr in arg.allExprs, yield expr 
     1582 
    16111583    get expr from var 
    16121584 
     
    16171589 
    16181590    pro isForAttribute from var 
    1619  
    1620     get hasError as bool is override 
    1621         if base.hasError, return true 
    1622         if _expr.hasError, return true 
    1623         for arg in _args, if arg.hasError, return true 
    1624         return false 
    16251591 
    16261592    get name as String 
     
    16311597        if e inherits IndexExpr, return e.toCobraSource 
    16321598        throw FallThroughException(e) 
    1633  
    1634     get allExprs as Expr* 
    1635         for expr in base.allExprs, yield expr 
    1636         for expr in .expr.allExprs, yield expr 
    1637         for arg in .args, for expr in arg.allExprs, yield expr 
    16381599 
    16391600    get willChangeVar as bool is override 
     
    18561817        .addField('expr', _expr) 
    18571818 
    1858     get expr from var as Expr 
    1859  
    1860     get hasError as bool is override 
    1861         if base.hasError, return true 
    1862         if _expr.hasError, return true 
    1863         return false 
    1864  
    18651819    get allExprs as Expr* 
    18661820        for expr in base.allExprs, yield expr 
    18671821        for expr in .expr.allExprs, yield expr 
     1822 
     1823    get expr from var as Expr 
    18681824 
    18691825    get willChangeVar as bool is override 
     
    19311887            assert false, r'$sharp expression must be a String Literal (No substitutions) expr=[expr]' 
    19321888 
    1933     get sharpSource from var 
    1934      
    1935     get expr from var 
    1936  
    1937     get hasError as bool is override 
    1938         if base.hasError, return true 
    1939         if _expr and _expr.hasError, return true 
    1940         return false 
    1941  
    19421889    get allExprs as Expr* 
    19431890        for expr in base.allExprs, yield expr 
    19441891        if .expr, for expr in .expr.allExprs, yield expr 
     1892 
     1893    get sharpSource from var 
     1894     
     1895    get expr from var 
    19451896 
    19461897    def toCobraSource as String is override 
     
    19841935        .addField('step', _step) 
    19851936 
    1986     get hasError as bool is override 
    1987         if base.hasError, return true 
    1988         if _target.hasError, return true 
    1989         if _start and _start.hasError, return true 
    1990         if _stop and _stop.hasError, return true 
    1991         if _step and _step.hasError, return true 
    1992         return false 
     1937    get allExprs as Expr* 
     1938        for expr in base.allExprs, yield expr 
     1939        for expr in .target.allExprs, yield expr 
     1940        if .start, for expr in .start.allExprs, yield expr 
     1941        if .stop, for expr in .stop.allExprs, yield expr 
     1942        if .step, for expr in .step.allExprs, yield expr 
    19931943 
    19941944    get willChangeVar as bool is override 
     
    21132063        .addField('Treatment', _treatment) 
    21142064 
     2065    get allExprs as Expr* 
     2066        for expr in base.allExprs, yield expr 
     2067        for expr in .expr.allExprs, yield expr 
     2068 
    21152069    get expr from var 
    2116  
    2117     get hasError as bool is override 
    2118         if base.hasError, return true 
    2119         if _expr.hasError, return true 
    2120         return false 
    21212070 
    21222071    get willChangeVar as bool is override 
     
    21282077 
    21292078    get notExpr from var 
    2130  
    2131     get allExprs as Expr* 
    2132         for expr in base.allExprs, yield expr 
    2133         for expr in .expr.allExprs, yield expr 
    21342079 
    21352080    def _bindImp 
     
    22192164        return _containedType 
    22202165 
    2221     get hasError as bool is override 
    2222         return base.hasError or (.typeNode and .typeNode.hasError) 
     2166    get _innerHasError as bool 
     2167        return base._innerHasError or (.typeNode and .typeNode.hasError) 
    22232168 
    22242169    get containedType from var 
     
    22682213        _expr = expr 
    22692214 
    2270     get opName as String is abstract 
    2271  
    2272     get expr from var 
    2273  
    2274     get hasError as bool 
    2275         if base.hasError, return true 
    2276         if .expr.hasError, return true 
    2277         return false 
    2278  
    22792215    get allExprs as Expr* 
    22802216        for expr in base.allExprs, yield expr 
    22812217        for expr in .expr.allExprs, yield expr 
     2218 
     2219    get opName as String is abstract 
     2220 
     2221    get expr from var 
    22822222 
    22832223    get willChangeVar as bool is override 
     
    23552295        .addField('expr', _expr) 
    23562296 
    2357     get hasError as bool is override 
    2358         if base.hasError, return true 
    2359         if _expr.hasError, return true 
    2360         return false 
     2297    get allExprs as Expr* 
     2298        for expr in base.allExprs, yield expr 
     2299        for expr in .expr.allExprs, yield expr 
    23612300 
    23622301    get willChangeVar as bool is override 
     
    23672306 
    23682307    get expr from var 
    2369  
    2370     get allExprs as Expr* 
    2371         for expr in base.allExprs, yield expr 
    2372         for expr in .expr.allExprs, yield expr 
    23732308 
    23742309    def _bindImp is override 
     
    26662601        .addField('items', _items) 
    26672602 
    2668     get items from var 
    2669         has Subnodes 
    2670  
    2671     get hasError as bool is override 
    2672         if base.hasError 
    2673             return true 
    2674         for item in _items 
    2675             if item.hasError 
    2676                 return true 
    2677         return false 
    2678  
    26792603    get allExprs as Expr* 
    26802604        for expr in base.allExprs, yield expr 
    26812605        for item in .items, for expr in item.allExprs, yield expr 
     2606 
     2607    get items from var 
     2608        has Subnodes 
    26822609 
    26832610    def toCobraSource as String is override 
     
    27162643        _format = format 
    27172644 
    2718     get expr from var 
    2719  
    2720     get format from var 
    2721  
    2722     get hasError as bool is override 
    2723         if base.hasError, return true 
    2724         if _expr.hasError, return true 
    2725         return false 
    2726  
    27272645    get allExprs as Expr* 
    27282646        for expr in base.allExprs, yield expr 
    27292647        for expr in .expr.allExprs, yield expr 
     2648 
     2649    get expr from var 
     2650 
     2651    get format from var 
    27302652 
    27312653    def toCobraSource as String is override 
     
    28432765        .addField('exprs', _exprs) 
    28442766 
    2845     get exprs from var 
    2846         has Subnodes 
    2847  
    2848     get hasError as bool is override 
    2849         if base.hasError, return true 
    2850         for expr in _exprs, if expr.hasError, return true 
    2851         return false 
    2852  
    28532767    get allExprs as Expr* 
    28542768        for expr in base.allExprs, yield expr 
    28552769        for expr in .exprs, for expr2 in expr.allExprs, yield expr2 
     2770 
     2771    get exprs from var 
     2772        has Subnodes 
    28562773 
    28572774    get willChangeVar as bool is override 
     
    29822899        base.addSubFields 
    29832900        .addField('entries', _entries) 
    2984  
    2985     get hasError as bool is override 
    2986         if base.hasError 
    2987             return true 
    2988         for entry in _entries 
    2989             for expr in entry 
    2990                 if expr.hasError 
    2991                     return true 
    2992         return false 
    29932901 
    29942902    get allExprs as Expr* 
     
    30732981        _expr = expr 
    30742982 
    3075     get rightTok from var 
    3076      
    3077     get expr from var 
    3078  
    3079     def _bindImp 
    3080         base._bindImp 
    3081         _expr.bindImp 
    3082  
    3083     get hasError as bool is override 
    3084         if base.hasError, return true 
    3085         if _expr.hasError, return true 
    3086         return false 
    3087  
    30882983    get allExprs as Expr* 
    30892984        for expr in base.allExprs, yield expr 
    30902985        for expr in .expr.allExprs, yield expr 
     2986 
     2987    get rightTok from var 
     2988     
     2989    get expr from var 
     2990 
     2991    def _bindImp 
     2992        base._bindImp 
     2993        _expr.bindImp 
    30912994 
    30922995    get willChangeVar as bool is override 
     
    31753078            _items, _operations = items, operations 
    31763079 
    3177     get items from var 
    3178  
    31793080    get allExprs as Expr* 
    31803081        for expr in base.allExprs, yield expr 
    31813082        for item in .items, for expr in item.allExprs, yield expr 
     3083 
     3084    get items from var 
    31823085 
    31833086    def _bindImp is override