Merge pull request #203 from sempare/fix-method-av

Fix method av

Author: darnocian

src/Sempare.Template.Common.pas

@@ -171,8 +171,11 @@ function Position(const APositional: IPosition): string; overload;
 end;
 
 procedure RaiseError(const APositional: IPosition; const AFormat: string; const AArgs: array of const); overload;
+var
+  LStr: string;
 begin
-  raise ETemplateEvaluationError.Create(APositional, Position(APositional) + format(AFormat, AArgs));
+  LStr := format(AFormat, AArgs);
+  raise ETemplateEvaluationError.Create(APositional, Position(APositional) + LStr);
 end;
 
 procedure RaiseError(const APositional: IPosition; const AFormat: string); overload;

src/Sempare.Template.Evaluate.pas

@@ -1115,7 +1115,6 @@ function TEvaluationTemplateVisitor.Invoke(const AExpr: IMethodCallExpr; const A
   LIntf: IInterface;
 begin
   LObjType := FContext.RttiContext().GetType(AObject.TypeInfo);
-  LMethod := LObjType.GetMethod(AExpr.Method);
   LObject := AObject;
   if LObject.Kind = tkInterface then
   begin
@@ -1129,7 +1128,10 @@ function TEvaluationTemplateVisitor.Invoke(const AExpr: IMethodCallExpr; const A
       LObject := AObject.AsType<TValue>;
   end;
   LMethod := LObjType.GetMethod(AExpr.Method);
-
+  if LMethod = nil then
+  begin
+    RaiseErrorRes(AExpr, @SMethodNotRegisteredOnObject, [LObject.TypeInfo.Name, AExpr.Method]);
+  end;
   exit(DoInvoke(AExpr, LMethod, LObject, AArgs, AHasResult));
 end;
 

src/Sempare.Template.Parser.pas

@@ -2154,7 +2154,7 @@ function TTemplateParser.RuleIdStmt: IStmt;
   end
   else
   begin
-    RaiseError(LSymbol.Position, format(SParsingErrorExpecting, ['variable reference, function call or assignment']));
+    RaiseError(LSymbol.Position, SParsingErrorExpecting, ['variable reference, function call or assignment']);
   end;
   LBeforeNLStripActions := MatchEndOfScript;
 
@@ -2598,7 +2598,7 @@ function TTemplateParser.Match(const ASymbol: TTemplateSymbol): TStripActionSet;
     FLookahead := FLexer.GetToken;
     exit;
   end;
-  RaiseError(LSymbol.Position, format(SParsingErrorExpecting, [TemplateSymbolToString(ASymbol)]));
+  RaiseError(LSymbol.Position, SParsingErrorExpecting, [TemplateSymbolToString(ASymbol)]);
 end;
 
 function TTemplateParser.Match(ASymbols: TTemplateSymbolSet; var AMatchSymbol: TTemplateSymbol): TStripActionSet;
@@ -2616,7 +2616,7 @@ function TTemplateParser.Match(ASymbols: TTemplateSymbolSet; var AMatchSymbol: T
     FLookahead := FLexer.GetToken;
     exit(LSymbol.StripActions);
   end;
-  RaiseError(LSymbol.Position, format(SParsingErrorExpecting, [TemplateSymbolToString(AMatchSymbol)]));
+  RaiseError(LSymbol.Position, SParsingErrorExpecting, [TemplateSymbolToString(AMatchSymbol)]);
 end;
 
 procedure TTemplateParser.Match(const ASymbol: ITemplateSymbol);
@@ -2641,7 +2641,7 @@ function TTemplateParser.MatchValues(const ASymbols: TTemplateSymbolSet; out ASy
     FLookahead := FLexer.GetToken;
     exit;
   end;
-  RaiseError(LSymbol.Position, format(SParsingErrorExpecting, [TemplateSymbolToString(ASymbol)]));
+  RaiseError(LSymbol.Position, SParsingErrorExpecting, [TemplateSymbolToString(ASymbol)]);
 end;
 
 function TTemplateParser.MatchValue(const ASymbol: TTemplateSymbol): string;
@@ -2656,7 +2656,7 @@ function TTemplateParser.MatchValue(const ASymbol: TTemplateSymbol): string;
     FLookahead := FLexer.GetToken;
     exit;
   end;
-  RaiseError(LSymbol.Position, format(SParsingErrorExpecting, [TemplateSymbolToString(ASymbol)]));
+  RaiseError(LSymbol.Position, SParsingErrorExpecting, [TemplateSymbolToString(ASymbol)]);
 end;
 
 function TTemplateParser.Parse(const AStream: TStream; const AManagedStream: boolean): ITemplate;

src/Sempare.Template.ResourceStrings.pas

@@ -65,6 +65,7 @@ interface
   SEndNotExpected = 'End not expected';
   SUnexpectedToken = 'UnexpectedToken';
   SFunctionNotRegisteredInContext = 'Function %s not registered in context.';
+  SMethodNotRegisteredOnObject = 'Method %s.%s does not exist.';
   SParsingErrorExpecting = 'Parsing error. Expecting: %s';
   SStringOrNumericTypesExpected = 'String or numeric types expected';
   SBinOpNotSupported = 'Binop not supported';

src/Sempare.Template.TemplateRegistry.pas

@@ -482,7 +482,7 @@ function TTemplateRegistry.GetTemplate(const ATemplateName: string; const AConte
         on e: ETemplateEvaluationError do
         begin
           LogException(e);
-          exit(true);
+          raise;
         end;
         on e: Exception do
         begin

tests/Sempare.Template.TestFunctions.pas

@@ -137,6 +137,10 @@   TFunctionTest = class
     procedure TestDomId;
     [Test]
     procedure TestFormatWithFloat;
+    [Test]
+    procedure TestCallingNonExistingMethod;
+    [Test]
+    procedure TestCallingNonExistingFunction;
   end;
 
 type
@@ -718,6 +722,38 @@ procedure TFunctionTest.TestDomId;
   end;
 end;
 
+procedure TFunctionTest.TestCallingNonExistingMethod;
+var
+  LRec1: TMyId1;
+begin
+  Assert.WillRaise(
+    procedure
+    begin
+      try
+        Template.Eval('<% _.nonexisting() %>', LRec1);
+      except
+        on e: exception do
+          raise;
+      end;
+    end);
+end;
+
+procedure TFunctionTest.TestCallingNonExistingFunction;
+var
+  LRec1: TMyId1;
+begin
+  Assert.WillRaise(
+    procedure
+    begin
+      try
+        Template.Eval('<% nonexisting() %>', LRec1);
+      except
+        on e: exception do
+          raise;
+      end;
+    end);
+end;
+
 initialization
 
 TDUnitX.RegisterTestFixture(TFunctionTest);