+41 -2

Prexonite/Compiler/AST/AstFactoryBase.cs

Reviewed

··· 222 222 concatenation._OptimizeInternal(CompileTimeExecutionContext); 223 223 } 224 224 225 225 + /// <summary> 226 226 + /// Report errors if either of the operands are <c>null</c>. 227 227 + /// </summary> 228 228 + /// <remarks> 229 229 + /// We do this in a separate method because <see cref="BinaryOperation"/> is annotated with non-null 230 230 + /// annotations, but there is one caller, the parser, for which it is impractical to have null checking enabled. 231 231 + /// </remarks> 232 232 + /// <returns><c>true</c> if the operands are valid; <c>false</c> otherwise</returns> 233 233 + private bool validateBinaryOperands(ISourcePosition position, [CanBeNull] AstExpr left, 234 234 + BinaryOperator op, [CanBeNull] AstExpr right) 235 235 + { 236 236 + var isValid = true; 237 237 + if (left == null) 238 238 + { 239 239 + ReportMessage(Message.Create( 240 240 + MessageSeverity.Error, 241 241 + string.Format(Resources.Parser_BinaryOperandMissing_Left, op), 242 242 + position, 243 243 + MessageClasses.IncompleteBinaryOperation)); 244 244 + isValid = false; 245 245 + } 246 246 + if (right == null) 247 247 + { 248 248 + ReportMessage(Message.Create( 249 249 + MessageSeverity.Error, 250 250 + string.Format(Resources.Parser_BinaryOperandMissing_Right, op), 251 251 + position, 252 252 + MessageClasses.IncompleteBinaryOperation)); 253 253 + isValid = false; 254 254 + } 255 255 + 256 256 + return isValid; 257 257 + } 258 258 + 225 259 public AstExpr BinaryOperation(ISourcePosition position, AstExpr left, BinaryOperator op, AstExpr right) 226 260 { 261 261 + if (!validateBinaryOperands(position, left, op, right)) 262 262 + { 263 263 + return IndirectCall(position, Null(position)); 264 264 + } 265 265 + 227 266 PValue leftNeutral = null; 228 267 PValue rightNeutral = null; 229 268 switch (op) ··· 269 308 // If the LH- or RHS was a concatenation, the concatenation variable is set. 270 309 // Applying other transformations would be wrong. 271 310 // "text" + 0 == "text0" 272 272 - // We don't want to ellide the addition of 0 here, even though 0 is the neutral element of addition. 311 311 + // We don't want to elide the addition of 0 here, even though 0 is the neutral element of addition. 273 312 if (concatenation != null) 274 313 { 275 314 _foldConcatenation(concatenation); ··· 345 384 case BinaryOperator.Coalescence: 346 385 return Coalescence(position, new[] {left, right}); 347 386 case BinaryOperator.Cast: 348 348 - if (!(right is AstTypeExpr T)) 387 387 + if (right is not AstTypeExpr T) 349 388 { 350 389 ReportMessage(Message.Error(Resources.AstFactoryBase_BinaryOperation_TypeExprExpected, 351 390 position, MessageClasses.TypeExpressionExpected));

+1

Prexonite/Compiler/MessageClasses.cs

Reviewed

··· 63 63 public const string QualifiedIdPartsAfterWildcard = "P.QualifiedIdPartsAfterWildcard"; 64 64 public const string NonTopLevelNamespaceImport = "P.NonTopLevelNamespaceImport"; 65 65 public const string UnexpectedDoubleColonInNamespaceName = "P.UnexpectedDoubleColonInNamespaceName"; 66 66 + public const string IncompleteBinaryOperation = "P.IncompleteBinaryOperation"; 66 67 67 68 #endregion 68 69

+6

Prexonite/Properties/Resources.resx

Reviewed

··· 439 439 <data name="Parser_DoubleColonInNamespaceName" xml:space="preserve"> 440 440 <value>Double colon (`::`) not allowed in namespace name.</value> 441 441 </data> 442 442 + <data name="Parser_BinaryOperandMissing_Left" xml:space="preserve"> 443 443 + <value>Left-hand side of {0} operation is missing.</value> 444 444 + </data> 445 445 + <data name="Parser_BinaryOperandMissing_Right" xml:space="preserve"> 446 446 + <value>Right-hand side of {0} operation is missing.</value> 447 447 + </data> 442 448 </root>

+9

PrexoniteTests/Tests/Translation.cs

Reviewed

··· 1472 1472 Assert.That(ldr.ErrorCount, Is.EqualTo(1), "Error count"); 1473 1473 } 1474 1474 1475 1475 + [Test] 1476 1476 + public void QuestionMarkSpliceIsInvalid() 1477 1477 + { 1478 1478 + var ldr = CompileInvalid(@" 1479 1479 + function main = println(?*); 1480 1480 + "); 1481 1481 + Assert.That(ldr.Errors.Where(m => m.MessageClass == MessageClasses.IncompleteBinaryOperation), Is.Not.Empty); 1482 1482 + } 1483 1483 + 1475 1484 [ContractAnnotation("value:null=>halt")] 1476 1485 private static void _assumeNotNull(object value) 1477 1486 {