Changeset 6918

Timestamp:

2010-11-09T09:15:14+01:00 (14 years ago)

Author:

sjoelund.se

Message:

Fix for bug #1350

• Check for invalid named fields in pattern record deconstructor

Location:

branches/sjoelund-functiontree

Files:

• . (modified) (1 prop)
• Compiler/Error.mo (modified) (2 diffs)
• Compiler/Patternm.mo (modified) (6 diffs)
• testsuite/meta/ErrorInvalidPattern1.mo (moved) (moved from branches/sjoelund-functiontree/testsuite/meta/ErrorInvalidPattern.mo) (2 diffs)
• testsuite/meta/ErrorInvalidPattern2.mo (added)
• testsuite/meta/ErrorInvalidPattern3.mo (added)
• testsuite/meta/Makefile (modified) (1 diff)

branches/sjoelund-functiontree/Compiler/Error.mo

@@ -283 +283 @@
 public constant ErrorID META_STRICT_RML_MATCH_IN_OUT=5016;
 public constant ErrorID META_NONE_CREF=5017;
+public constant ErrorID META_INVALID_PATTERN_NAMED_FIELD=5018;
 
 protected constant list<tuple<Integer, MessageType, Severity, String>> errorTable=
@@ -638 +639 @@
           (LOOKUP_FUNCTION_GOT_CLASS,TRANSLATION(),ERROR(),"Looking for a function %s but found a %s."),
           (META_STRICT_RML_MATCH_IN_OUT,TRANSLATION(),ERROR(),"%s. Strict RML enforces match expression input and output to be the same as the function's."),
-          (META_NONE_CREF,TRANSLATION(),ERROR(),"NONE is not acceptable syntax. Use NONE() instead.")
+          (META_NONE_CREF,TRANSLATION(),ERROR(),"NONE is not acceptable syntax. Use NONE() instead."),
+          (META_INVALID_PATTERN_NAMED_FIELD,TRANSLATION(),ERROR(),"Invalid named fields: %s")
           };
 

branches/sjoelund-functiontree/Compiler/Patternm.mo

@@ -486 +486 @@
       RenamedPat pat,first2,second2;
       Integer constTag,i,numPosArgs;
-      list<Absyn.NamedArg> namedArgList;
+      list<Absyn.NamedArg> namedArgList,invalidArgs;
       Absyn.Path recName,pathName;
       SCode.Class sClass;
@@ -611 +611 @@
 
         // CALL EXPRESSION - translates pos/named args into only pos ones
-    case (Absyn.CALL(compRef,Absyn.FUNCTIONARGS(funcArgs,namedArgList)),
-        localVar,localAsBinds,localCache,localEnv,localConstTagEnv,info)
+    case (Absyn.CALL(compRef,Absyn.FUNCTIONARGS(funcArgs,namedArgList)),localVar,localAsBinds,localCache,localEnv,localConstTagEnv,info)
       equation
         recName = Absyn.crefToPath(compRef);
@@ -628 +627 @@
 
         //Sorting of named arguments
-        funcArgsNamedFixed = generatePositionalArgs(fieldNamesNamed,namedArgList,{});
+        (funcArgsNamedFixed,invalidArgs) = generatePositionalArgs(fieldNamesNamed,namedArgList,{});
         funcArgs = listAppend(funcArgs,funcArgsNamedFixed);
 
-        (localCache,renamedPatList,localAsBinds2,localConstTagEnv,status) = renamePatList(funcArgs
-          ,localVar2,1,{},{},localCache,localEnv,localConstTagEnv,info);
+        (localCache,renamedPatList,localAsBinds2,localConstTagEnv,status) = renamePatList(funcArgs,localVar2,1,{},{},localCache,localEnv,localConstTagEnv,info);
         pat = DFA.RP_CALL(localVar,compRef,renamedPatList);
-
+        status = checkInvalidPatternNamedArgs(invalidArgs,status,info);
       then (localCache,pat,listAppend(localAsBinds,localAsBinds2),localConstTagEnv,status);
         // EMPTY LIST EXPRESSION
@@ -2001 +1999 @@
   input list<Absyn.Exp> accList;
   output list<Absyn.Exp> outList;
-algorithm
-  outList :=
-  matchcontinue (fieldNameList,namedArgList,accList)
+  output list<Absyn.NamedArg> outInvalidNames;
+algorithm
+  (outList,outInvalidNames) := matchcontinue (fieldNameList,namedArgList,accList)
     local
       list<Absyn.Exp> localAccList;
       list<Absyn.Ident> restFieldNames;
       Absyn.Ident firstFieldName;
-      list<Absyn.Exp> expL;
+      Absyn.Exp exp;
       list<Absyn.NamedArg> localNamedArgList;
-    case ({},_,localAccList) then localAccList;
+    case ({},namedArgList,localAccList) then (listReverse(localAccList),namedArgList);
     case (firstFieldName :: restFieldNames,localNamedArgList,localAccList)
       equation
-        expL = Util.listCreate(findFieldExpInList(firstFieldName,localNamedArgList));
-        localAccList = listAppend(localAccList,expL);
-        localAccList = generatePositionalArgs(restFieldNames,localNamedArgList,localAccList);
-      then localAccList;
+        (exp,localNamedArgList) = findFieldExpInList(firstFieldName,localNamedArgList);
+        (localAccList,localNamedArgList) = generatePositionalArgs(restFieldNames,localNamedArgList,exp::localAccList);
+      then (localAccList,localNamedArgList);
   end matchcontinue;
 end generatePositionalArgs;
@@ -2027 +2024 @@
   input list<Absyn.NamedArg> namedArgList;
   output Absyn.Exp outExp;
-algorithm
-  outExp :=
-  matchcontinue (firstFieldName,namedArgList)
+  output list<Absyn.NamedArg> outNamedArgList;
+algorithm
+  (outExp,outNamedArgList) := matchcontinue (firstFieldName,namedArgList)
     local
       Absyn.Exp e;
       Absyn.Ident localFieldName,aName;
-      list<Absyn.NamedArg> restNamedArgList;
-    case (_,{}) then Absyn.CREF(Absyn.WILD());
-    case (localFieldName,Absyn.NAMEDARG(aName,e) :: _)
+      list<Absyn.NamedArg> rest;
+      Absyn.NamedArg first;
+    case (_,{}) then (Absyn.CREF(Absyn.WILD()),{});
+    case (localFieldName,Absyn.NAMEDARG(aName,e) :: rest)
       equation
         true = stringEq(localFieldName,aName);
-      then e;
-    case (localFieldName,_ :: restNamedArgList)
-      equation
-        e = findFieldExpInList(localFieldName,restNamedArgList);
-      then e;
+      then (e,rest);
+    case (localFieldName,first::rest)
+      equation
+        (e,rest) = findFieldExpInList(localFieldName,rest);
+      then (e,first::rest);
   end matchcontinue;
 end findFieldExpInList;
@@ -2631 +2629 @@
 end getCaseDecls;
 
+protected function checkInvalidPatternNamedArgs
+"Checks that there are no invalid named arguments in the pattern"
+  input list<Absyn.NamedArg> args;
+  input Util.Status status;
+  input Absyn.Info info;
+  output Util.Status outStatus;
+algorithm
+  outStatus := match (args,status,info)
+    local
+      list<String> argsNames;
+      String str1;
+    case ({},status,_) then status;
+    case (args,status,info)
+      equation
+        (argsNames,_) = Absyn.getNamedFuncArgNamesAndValues(args);
+        str1 = Util.stringDelimitList(argsNames, ",");
+        Error.addSourceMessage(Error.META_INVALID_PATTERN_NAMED_FIELD, {str1}, info);
+      then Util.FAILURE();
+  end match;
+end checkInvalidPatternNamedArgs;
+
 end Patternm;

branches/sjoelund-functiontree/testsuite/meta/ErrorInvalidPattern1.mo

@@ -1 @@
-// name: ErrorInvalidPattern
+// name: ErrorInvalidPattern1
 // cflags: +g=MetaModelica
 // status: incorrect
-package ErrorInvalidPattern
+
+package ErrorInvalidPattern1
 
 function fn
@@ -15 +16 @@
 constant String str = fn("");
 
-end ErrorInvalidPattern;
+end ErrorInvalidPattern1;
+
 // Result:
-// Error processing file: ErrorInvalidPattern.mo
-// [ErrorInvalidPattern.mo:11:10-11:19:writable] Error: Invalid pattern: str + ""
+// Error processing file: ErrorInvalidPattern1.mo
+// [ErrorInvalidPattern1.mo:12:10-12:19:writable] Error: Invalid pattern: str + ""
 // 
 // # Error encountered! Exiting...

branches/sjoelund-functiontree/testsuite/meta/Makefile

@@ -16 +16 @@
 EqPatternm.mos \
 ErrorInteractiveCallFunctionPtr.mos \
-ErrorInvalidPattern.mo \
+ErrorInvalidPattern1.mo \
+ErrorInvalidPattern2.mo \
+ErrorInvalidPattern3.mo \
 ErrorMatchInOut1.mo \
 ErrorMatchInOut2.mo \