metron-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cestella <...@git.apache.org>
Subject [GitHub] metron pull request #606: METRON-980: Short circuit operations for Stellar
Date Wed, 07 Jun 2017 13:26:51 GMT
Github user cestella commented on a diff in the pull request:

    https://github.com/apache/metron/pull/606#discussion_r120623833
  
    --- Diff: metron-platform/metron-common/src/main/java/org/apache/metron/common/stellar/StellarCompiler.java
---
    @@ -76,14 +92,80 @@ public Expression(Deque<Token<?>> tokenDeque) {
     
         public Object apply(ExpressionState state) {
           Deque<Token<?>> instanceDeque = new ArrayDeque<>();
    -      for(Iterator<Token<?>> it = getTokenDeque().descendingIterator();it.hasNext();)
{
    -        Token<?> token = it.next();
    -        if(token.getUnderlyingType() == DeferredFunction.class) {
    -          DeferredFunction func = (DeferredFunction) token.getValue();
    -          func.apply(instanceDeque, state);
    -        }
    -        else {
    -          instanceDeque.push(token);
    +      {
    +        boolean skipElse = false;
    +        Token<?> token = null;
    +        for (Iterator<Token<?>> it = getTokenDeque().descendingIterator();
it.hasNext(); ) {
    +          token = it.next();
    +          //if we've skipped an else previously, then we need to skip the deferred tokens
associated with the else.
    +          if(skipElse && token.getUnderlyingType() == ElseExpr.class) {
    +            while(it.hasNext()) {
    +              token = it.next();
    +              if(token.getUnderlyingType() == EndConditional.class) {
    +                break;
    +              }
    --- End diff --
    
    Yep, I just added this case to the `StellarTest`


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message