Projects >> groovy-git >>dbf8dfd213c94e7eec5ca974397fe79aa08df143

Chunk
Conflicting content 
                        storeType(call, (ClassNode) data);
                    }
                }
<<<<<<< HEAD
                int nbOfArgs = 0;
                if (callArguments instanceof ArgumentListExpression) {
                    ArgumentListExpression list = (ArgumentListExpression) callArguments;
                    nbOfArgs = list.getExpressions().size();
                } else {
                    // todo : other cases
                    nbOfArgs = 0;
                }
                storeTargetMethod(call,
                        nbOfArgs==0?CLOSURE_CALL_NO_ARG:
                        nbOfArgs==1?CLOSURE_CALL_ONE_ARG:
                                    CLOSURE_CALL_VARGS);
=======
>>>>>>> 7adf7a313f54ea7d737b56a58ee757e834ec2589
            } else {
                // method call receivers are :
                //   - possible "with" receivers
Solution content 
                        storeType(call, (ClassNode) data);
                    }
                }
                int nbOfArgs = 0;
                if (callArguments instanceof ArgumentListExpression) {
                    ArgumentListExpression list = (ArgumentListExpression) callArguments;
                    nbOfArgs = list.getExpressions().size();
                } else {
                    // todo : other cases
                    nbOfArgs = 0;
                }
                storeTargetMethod(call,
                        nbOfArgs==0?CLOSURE_CALL_NO_ARG:
                        nbOfArgs==1?CLOSURE_CALL_ONE_ARG:
                                    CLOSURE_CALL_VARGS);
            } else {
                // method call receivers are :
                //   - possible "with" receivers
File
StaticTypeCheckingVisitor.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable