sum has return type 'Integer' not TemplateParameter T

git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@6404 3260e6d1-4efc-4170-b0a7-36055960796d

src/ocl_library.sml

@@ -246,7 +246,8 @@ val oclLib =
 			     postcondition=[],
 			     precondition=[],
 			     result=TemplateParameter "T",
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("object",TemplateParameter "T")],
@@ -356,91 +357,156 @@ val oclLib =
 			     },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="==",postcondition=[],precondition=[],
+			     isQuery=true,
-			     result=Boolean,scope=XMI.InstanceScope,
+			     name="==",
+			     postcondition=[],
+			     precondition=[],
+			     result=Boolean,
+			     scope=XMI.InstanceScope,
 			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="~=",postcondition=[],precondition=[],
+			     isQuery=true,
-			     result=Boolean,scope=XMI.InstanceScope,
+			     name="~=",
+			     postcondition=[],
+			     precondition=[],
+			     result=Boolean,
+			     scope=XMI.InstanceScope,
 			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="~==",postcondition=[],precondition=[],
+			     isQuery=true,
-			     result=Boolean,scope=XMI.InstanceScope,
+			     name="~==",
+			     postcondition=[],
+			     precondition=[],
+			     result=Boolean,
+			     scope=XMI.InstanceScope,
 			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="~=~",postcondition=[],precondition=[],
+			     isQuery=true,
-			     result=Boolean,scope=XMI.InstanceScope,
+			     name="~=~",
+			     postcondition=[],
+			     precondition=[],
+			     result=Boolean,
+			     scope=XMI.InstanceScope,
 			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="~==~",postcondition=[],precondition=[],
+			     isQuery=true,
-			     result=Boolean,scope=XMI.InstanceScope,
+			     name="~==~",
+			     postcondition=[],
+			     precondition=[],
+			     result=Boolean,
+			     scope=XMI.InstanceScope,
 			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="union",postcondition=[],precondition=[],
+			     isQuery=true,
+			     name="union",
+			     postcondition=[],
+			     precondition=[],
 			     result=Bag(TemplateParameter "T"),
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("bag",Bag(TemplateParameter "T"))],
-			     isQuery=true,name="intersection",postcondition=[],
+			     isQuery=true,
-			     precondition=[],result=Bag(TemplateParameter "T"),
+			     name="intersection",
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     postcondition=[],
+			     precondition=[],
+			     result=Bag(TemplateParameter "T"),
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
 			    },
 			    {
 			     arguments=[("set",Set(TemplateParameter "T"))],
-			     isQuery=true,name="intersection",postcondition=[],
+			     isQuery=true,
-			     precondition=[],result=Set(TemplateParameter "T"),
+			     name="intersection",
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     postcondition=[],
-			    },
+			     precondition=[],
-			    {
+			     result=Set(TemplateParameter "T"),
-			     arguments=[("object",TemplateParameter "T")],
+			     scope=XMI.InstanceScope,
-			     isQuery=true,name="including",postcondition=[],
-			     precondition=[],result=Bag(TemplateParameter "T"),
-			     scope=XMI.InstanceScope,visibility=XMI.public
-			    },
-			    {
-			     arguments=[("object",TemplateParameter "T")],
-			     isQuery=true,name="excluding",postcondition=[],
-			     precondition=[],result=Bag(TemplateParameter "T"),
-			     scope=XMI.InstanceScope,visibility=XMI.public
-			    },
-			    {
-			     arguments=[("object",TemplateParameter "T")],
-			     isQuery=true,name="count",postcondition=[],precondition=[],
-			     result=Integer,scope=XMI.InstanceScope,
 			     visibility=XMI.public
 			    },
 			    {
-			     arguments=[],isQuery=true,name="flatten",postcondition=[],
+			     arguments=[("object",TemplateParameter "T")],
-			     precondition=[],result=Bag(TemplateParameter "T"),
+			     isQuery=true,
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     name="including",
+			     postcondition=[],
+			     precondition=[],
+			     result=Bag(TemplateParameter "T"),
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
 			    },
 			    {
-			     arguments=[],isQuery=true,name="asSet",postcondition=[],
+			     arguments=[("object",TemplateParameter "T")],
-			     precondition=[],result=Set(TemplateParameter "T"),
+			     isQuery=true,
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     name="excluding",
+			     postcondition=[],
+			     precondition=[],
+			     result=Bag(TemplateParameter "T"),
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
 			    },
 			    {
-			     arguments=[],isQuery=true,name="asSequence",
+			     arguments=[("object",TemplateParameter "T")],
-			     postcondition=[],precondition=[],
+			     isQuery=true,
+			     name="count",
+			     postcondition=[],
+			     precondition=[],
+			     result=Integer,
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
+			    },
+			    {
+			     arguments=[],
+			     isQuery=true,
+			     name="flatten",
+			     postcondition=[],
+			     precondition=[],
+			     result=Bag(TemplateParameter "T"),
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
+			    },
+			    {
+			     arguments=[],
+			     isQuery=true,
+			     name="asSet",
+			     postcondition=[],
+			     precondition=[],
+			     result=Set(TemplateParameter "T"),
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
+			    },
+			    {
+			     arguments=[],
+			     isQuery=true,
+			     name="asSequence",
+			     postcondition=[],
+			     precondition=[],
 			     result=Sequence(TemplateParameter "T"),
-			     scope=XMI.InstanceScope,visibility=XMI.public
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public
 			    },
 			    {
-			     arguments=[],isQuery=true,name="asBag",postcondition=[],
+			     arguments=[],
-			     precondition=[],result=Bag(TemplateParameter "T"),
+			     isQuery=true,
-			     scope=XMI.InstanceScope,visibility=XMI.public}],parent=NONE,
+			     name="asBag",
-			    stereotypes=[],thyname=NONE
+			     postcondition=[],
+			     precondition=[],
+			     result=Bag(TemplateParameter "T"),
+			     scope=XMI.InstanceScope,
+			     visibility=XMI.public}],
+			    parent=NONE,
+			    stereotypes=[],
+			    thyname=NONE
 			   }: Rep_Core.Classifier
 	 },
      Template
@@ -456,139 +522,238 @@ val oclLib =
 			     operations=[
 			     {
 			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="union",postcondition=[],precondition=[],
+			      isQuery=true,
+			      name="union",
+			      postcondition=[],
+			      precondition=[],
 			      result=Set(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 			     {
-			      arguments=[],isQuery=true,name="notEmpty",postcondition=[],
+			      arguments=[],
-			      precondition=[],result=Boolean,
+			      isQuery=true,
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      name="notEmpty",
+			      postcondition=[],
+			      precondition=[],
+			      result=Boolean,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 			     {
-			      arguments=[],isQuery=true,name="size",postcondition=[],
+			      arguments=[],
-			      precondition=[],result=Integer,
+			      isQuery=true,
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      name="size",
+			      postcondition=[],
+			      precondition=[],
+			      result=Integer,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 			     {
 			      arguments=[("bag",Bag(TemplateParameter "T"))],
-			      isQuery=true,name="union",postcondition=[],precondition=[],
+			      isQuery=true,
+			      name="union",
+			      postcondition=[],
+			      precondition=[],
 			      result=Bag(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      scope=XMI.InstanceScope,
-			     },
-			     {
-			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="=",postcondition=[],precondition=[],
-			      result=Boolean,scope=XMI.InstanceScope,
 			      visibility=XMI.public
 			     },
 			     {
 			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="==",postcondition=[],precondition=[],
+			      isQuery=true,
-			      result=Boolean,scope=XMI.InstanceScope,
+			      name="=",
-			      visibility=XMI.public
+			      postcondition=[],
-			     },
+			      precondition=[],
-{
+			      result=Boolean,
-			      arguments=[],isQuery=true,name="isEmpty",postcondition=[],
+			      scope=XMI.InstanceScope,
-			      precondition=[],result=Boolean,
-			      scope=XMI.InstanceScope,visibility=XMI.public
-			     },
-			     {
-			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="~=",postcondition=[],precondition=[],
-			      result=Boolean,scope=XMI.InstanceScope,
 			      visibility=XMI.public
 			     },
 			     {
 			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="~==",postcondition=[],precondition=[],
+			      isQuery=true,
-			      result=Boolean,scope=XMI.InstanceScope,
+			      name="==",
+			      postcondition=[],
+			      precondition=[],
+			      result=Boolean,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+{
+			      arguments=[],
+			      isQuery=true,
+			      name="isEmpty",
+			      postcondition=[],
+			      precondition=[],
+			      result=Boolean,
+			      scope=XMI.InstanceScope,
 			      visibility=XMI.public
 			     },
 			     {
 			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="~=~",postcondition=[],precondition=[],
+			      isQuery=true,
-			      result=Boolean,scope=XMI.InstanceScope,
+			      name="~=",
-			      visibility=XMI.public
+			      postcondition=[],
-			     },
+			      precondition=[],
-
+			      result=Boolean,
-			     {
+			      scope=XMI.InstanceScope,
-			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="~==~",postcondition=[],precondition=[],
-			      result=Boolean,scope=XMI.InstanceScope,
 			      visibility=XMI.public
 			     },
 			     {
 			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="intersection",postcondition=[],
+			      isQuery=true,
-			      precondition=[],result=Set(TemplateParameter "T"),
+			      name="~==",
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      postcondition=[],
+			      precondition=[],
+			      result=Boolean,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[("s",Set(TemplateParameter "T"))],
+			      isQuery=true,
+			      name="~=~",
+			      postcondition=[],
+			      precondition=[],
+			      result=Boolean,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[("s",Set(TemplateParameter "T"))],
+			      isQuery=true,
+			      name="~==~",
+			      postcondition=[],
+			      precondition=[],
+			      result=Boolean,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[("s",Set(TemplateParameter "T"))],
+			      isQuery=true,
+			      name="intersection",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 			     {
 			      arguments=[("bag",Bag(TemplateParameter "T"))],
-			      isQuery=true,name="intersection",postcondition=[],
+			      isQuery=true,
-			      precondition=[],result=Set(TemplateParameter "T"),
+			      name="intersection",
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      postcondition=[],
-			     },
+			      precondition=[],
-			     {
-			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="-",postcondition=[],precondition=[],
 			      result=Set(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      scope=XMI.InstanceScope,
-			     },
-			     {
-			      arguments=[("object",TemplateParameter "T")],
-			      isQuery=true,name="including",postcondition=[],
-			      precondition=[],result=Set(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
-			     },
-			     {
-			      arguments=[("object",TemplateParameter "T")],
-			      isQuery=true,name="excluding",postcondition=[],
-			      precondition=[],result=Set(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
-			     },
-			     {
-			      arguments=[("s",Set(TemplateParameter "T"))],
-			      isQuery=true,name="symmetricDifference",postcondition=[],
-			      precondition=[],result=Set(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
-			     },
-			     {
-			      arguments=[("object",TemplateParameter "T")],
-			      isQuery=true,name="count",postcondition=[],precondition=[],
-			      result=Integer,scope=XMI.InstanceScope,
 			      visibility=XMI.public
 			     },
 			     {
-			      arguments=[],isQuery=true,name="flatten",postcondition=[],
+			      arguments=[("s",Set(TemplateParameter "T"))],
-			      precondition=[],result=Set(TemplateParameter "T"),
+			      isQuery=true,
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      name="-",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 			     {
-			      arguments=[],isQuery=true,name="asSet",postcondition=[],
+			      arguments=[("object",TemplateParameter "T")],
-			      precondition=[],result=Set(TemplateParameter "T"),
+			      isQuery=true,
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      name="including",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 			     {
-			      arguments=[],isQuery=true,name="asSequence",
+			      arguments=[("object",TemplateParameter "T")],
-			      postcondition=[],precondition=[],
+			      isQuery=true,
+			      name="excluding",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[("s",Set(TemplateParameter "T"))],
+			      isQuery=true,
+			      name="symmetricDifference",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[("object",TemplateParameter "T")],
+			      isQuery=true,
+			      name="count",
+			      postcondition=[],
+			      precondition=[],
+			      result=Integer,
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[],
+			      isQuery=true,
+			      name="flatten",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[],
+			      isQuery=true,
+			      name="asSet",
+			      postcondition=[],
+			      precondition=[],
+			      result=Set(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
+			     },
+			     {
+			      arguments=[],
+			      isQuery=true,
+			      name="asSequence",
+			      postcondition=[],
+			      precondition=[],
 			      result=Sequence(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 
 			     {
-			      arguments=[],isQuery=true,name="asBag",postcondition=[],
+			      arguments=[],
-			      precondition=[],result=Bag(TemplateParameter "T"),
+			      isQuery=true,
-			      scope=XMI.InstanceScope,visibility=XMI.public
+			      name="asBag",
+			      postcondition=[],
+			      precondition=[],
+			      result=Bag(TemplateParameter "T"),
+			      scope=XMI.InstanceScope,
+			      visibility=XMI.public
 			     },
 
 			     {
 			      arguments=[("set",Set(TemplateParameter "T"))],
-			      isQuery=true,name="union",postcondition=[],precondition=[],
+			      isQuery=true,
+			      name="union",
+			      postcondition=[],
+			      precondition=[],
 			      result=Bag(TemplateParameter "T"),
-			      scope=XMI.InstanceScope,visibility=XMI.public}],parent=NONE,
+			      scope=XMI.InstanceScope,
-			     stereotypes=[],thyname=NONE
+			      visibility=XMI.public}],
+			     parent=NONE,
+			     stereotypes=[],
+			     thyname=NONE
 			    }: Rep_Core.Classifier
 	 },Template
 	 {
@@ -859,7 +1024,7 @@ val oclLib =
 			     },
 			     {
 			      arguments=[],isQuery=true,name="sum",postcondition=[],
-			      precondition=[],result=TemplateParameter "T",
+			      precondition=[],result=Integer,
 			      scope=XMI.InstanceScope,visibility=XMI.public
 			     },
 			     {
@@ -889,6 +1054,16 @@ val oclLib =
 	 {
 	  associationends=[],interfaces=[],invariant=[],name=OclAny,
 	  operations=[
+	  {
+	   arguments=[],
+	   isQuery=true,
+	   name="notEmpty",
+	   postcondition=[],
+	   precondition=[],
+	   result=Boolean,
+	   scope=XMI.InstanceScope,
+	   visibility=XMI.public
+	  },
 	  {
 	   arguments=[("object",OclAny)],
            isQuery=true,name="=",postcondition=[],precondition=[],