Browse Source

Merge remote-tracking branch 'Stan/development' into development

kindlich 6 years ago
parent
commit
13e6920fcd
No known key found for this signature in database

+ 2
- 0
CodeFormatter/src/main/java/org/openzen/zenscript/formatter/ExpressionFormatter.java View File

259
 				result.append(".");
259
 				result.append(".");
260
 				result.append(operator.operator);
260
 				result.append(operator.operator);
261
 			}
261
 			}
262
+		} else if (expression.member.isCaller()) {
263
+			// nothing
262
 		} else {
264
 		} else {
263
 			result.append(".");
265
 			result.append(".");
264
 			result.append(expression.member.getMethodName());
266
 			result.append(expression.member.getMethodName());

+ 4
- 0
CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/FunctionalMemberRef.java View File

69
 		return target.getKind() == FunctionalKind.OPERATOR;
69
 		return target.getKind() == FunctionalKind.OPERATOR;
70
 	}
70
 	}
71
 	
71
 	
72
+	public boolean isCaller() {
73
+		return target.getKind() == FunctionalKind.CALLER;
74
+	}
75
+	
72
 	public OperatorType getOperator() {
76
 	public OperatorType getOperator() {
73
 		return ((OperatorMember) target).operator;
77
 		return ((OperatorMember) target).operator;
74
 	}
78
 	}

Loading…
Cancel
Save