Version 1.3.1

martinweismann · martinweismann · commit d054c8836654 · 2018-12-12T14:23:27.000+01:00
diff --git a/Examples/Primes/LibPrimes_component/Bindings/C/libprimes.h b/Examples/Primes/LibPrimes_component/Bindings/C/libprimes.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/C/libprimes_types.h b/Examples/Primes/LibPrimes_component/Bindings/C/libprimes_types.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file with basic types in
 order to allow an easy use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/CDynamic/libprimes_dynamic.cpp b/Examples/Primes/LibPrimes_component/Bindings/CDynamic/libprimes_dynamic.cpp
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/CDynamic/libprimes_dynamic.h b/Examples/Primes/LibPrimes_component/Bindings/CDynamic/libprimes_dynamic.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/CDynamic/libprimes_types.h b/Examples/Primes/LibPrimes_component/Bindings/CDynamic/libprimes_types.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file with basic types in
 order to allow an easy use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes.cpp b/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes.cpp
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated C++ Wrapper Implementation file in order to allow 
 an easy use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes.h b/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes.hpp b/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes.hpp
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated C++ Header file in order to allow an easy use
  of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes_types.h b/Examples/Primes/LibPrimes_component/Bindings/Cpp/libprimes_types.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file with basic types in
 order to allow an easy use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/CppDynamic/libprimes_dynamic.h b/Examples/Primes/LibPrimes_component/Bindings/CppDynamic/libprimes_dynamic.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/CppDynamic/libprimes_dynamic.hpp b/Examples/Primes/LibPrimes_component/Bindings/CppDynamic/libprimes_dynamic.hpp
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated C++ Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/CppDynamic/libprimes_types.h b/Examples/Primes/LibPrimes_component/Bindings/CppDynamic/libprimes_types.h
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated plain C Header file with basic types in
 order to allow an easy use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/Pascal/Unit_LibPrimes.pas b/Examples/Primes/LibPrimes_component/Bindings/Pascal/Unit_LibPrimes.pas
@@ -5,7 +5,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Pascal Header file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Bindings/Python/LibPrimes.py b/Examples/Primes/LibPrimes_component/Bindings/Python/LibPrimes.py
@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Python file in order to allow an easy
  use of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Examples/CPP/LibPrimes_example.cpp b/Examples/Primes/LibPrimes_component/Examples/CPP/LibPrimes_example.cpp
@@ -4,7 +4,7 @@ Copyright (C) 2018 Automatic Component Toolkit Developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated C++ application that demonstrates the
  usage of the C++ bindings of Prime Numbers Interface
diff --git a/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes.lpr b/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes.lpr
@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Pascal project file in order to allow easy
 development of Prime Numbers Interface.
diff --git a/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_exception.pas b/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_exception.pas
@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Pascal exception class definition file in order to allow easy
 development of Prime Numbers Interface. The functions in this file need to be implemented. It needs to be generated only once.
diff --git a/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_exports.pas b/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_exports.pas
@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Pascal export implementation file in order to allow easy
 development of Prime Numbers Interface. The functions in this file need to be implemented. It needs to be generated only once.
diff --git a/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_interfaces.pas b/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_interfaces.pas
@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Pascal interface definition file in order to allow easy
 development of Prime Numbers Interface. The functions in this file need to be implemented. It needs to be generated only once.
diff --git a/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_types.pas b/Examples/Primes/LibPrimes_component/Implementations/Pascal/Interfaces/libprimes_types.pas
@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.3.1.
 
 Abstract: This is an autogenerated Pascal type definition file in order to allow easy
 development of Prime Numbers Interface. The functions in this file need to be implemented. It needs to be generated only once.
diff --git a/Source/automaticcomponenttoolkit.go b/Source/automaticcomponenttoolkit.go
@@ -69,11 +69,12 @@ func readComponentDefinition(FileName string, ACTVersion string) (ComponentDefin
 }
 
 func main () {
-	ACTVersion := "1.3.0"
+	ACTVersion := "1.3.1"
 	fmt.Fprintln(os.Stdout, "Automatic Component Toolkit v" + ACTVersion)
 	if (len (os.Args) < 2) {
-		log.Fatal ("Please run with the configuration XML as command line parameter.");
+		log.Fatal ("Please run with the Interface Description XML as command line parameter.");
 		log.Fatal ("To specify a path for the generated source code use the optional flag \"-o ABSOLUTE_PATH_TO_OUTPUT_FOLDER\"");
+		log.Fatal ("To create a diff between two versions of an Interface Description XML use the optional flagg \"-d OTHER_IDL_FILE\"");
 	}
 	if os.Args[1] == "-v" {
 		fmt.Fprintln(os.Stdout, "Version: "+ACTVersion)
@@ -156,11 +157,20 @@ func main () {
 		log.Fatal (err);
 	}
 
+
+	licenseFileName := path.Join(outputFolder, "license.txt");
+	log.Printf("Creating \"%s\"", licenseFileName)
+	licenseFile, err :=  CreateLanguageFile (licenseFileName, "")
+	if err != nil {
+		log.Fatal (err);
+	}
+	licenseFile.WritePlainLicenseHeader(component, "", false);
+
 	if (len(component.BindingList.Bindings) > 0) {
 		err  = os.MkdirAll(outputFolderBindings, os.ModePerm);
 		if (err != nil) {
 			log.Fatal (err);
-		}	
+		}
 	}
 	for bindingindex := 0; bindingindex < len(component.BindingList.Bindings); bindingindex++ {
 		binding := component.BindingList.Bindings[bindingindex];
diff --git a/Source/componentdefinition.go b/Source/componentdefinition.go
@@ -380,6 +380,24 @@ func checkClasses(classes[] ComponentDefinitionClass) (map[string]bool, error) {
 		classLowerNameList[strings.ToLower(class.ClassName)] = true
 		classNameList[class.ClassName] = true
 	}
+
+	for i := 0; i < len(classes); i++ {
+		class := classes[i];
+		parentClass := class.ParentClass;
+		if (len(parentClass) > 0) {
+			if !nameIsValidIdentifier(parentClass) {
+				return nil, fmt.Errorf ("invalid class parent name \"%s\"", parentClass);
+			}
+			if (classNameList[parentClass] == false) {
+				return nil, fmt.Errorf ("unknown parent class \"%s\" for class \"%s\"", parentClass, class.ClassName);
+			}
+			if (strings.ToLower(class.ClassName) == strings.ToLower(parentClass)) {
+				return nil, fmt.Errorf ("class \"%s\" cannot be its own parent class \"%s\"", class.ClassName, parentClass);
+			}
+
+		}
+	}
+
 	return classNameList, nil
 }
 
diff --git a/Source/languagepascal.go b/Source/languagepascal.go
@@ -168,33 +168,6 @@ func writePascalBaseTypeDefinitions(componentdefinition ComponentDefinition, w L
 		
 		w.Writeln ( "");
 
-		if len(componentdefinition.Functions) > 0 {
-			w.Writeln ("(*************************************************************************************************************************");
-			w.Writeln (" Declaration of function types");
-			w.Writeln ("**************************************************************************************************************************)");
-			w.Writeln ("");
-			for i := 0; i < len(componentdefinition.Functions); i++ {
-				funcinfo := componentdefinition.Functions[i];
-				arguments := ""
-				for j := 0; j<len(funcinfo.Params); j++ {
-					param := funcinfo.Params[j]
-					if (arguments != "") {
-					 	arguments = arguments + "; "
-					}
-					cParams, err := generatePlainPascalParameter(param, "", funcinfo.FunctionName, NameSpace)
-					if (err != nil) {
-						return err
-					}
-					arguments = arguments + cParams[0].ParamConvention + cParams[0].ParamName + ": " + cParams[0].ParamType
-				}
-
-				w.Writeln ("  P%s_%s = function(%s): Integer;", NameSpace, funcinfo.FunctionName, arguments);
-			}
-		}
-		
-		w.Writeln ( "");
-		
-
 		w.Writeln ("(*************************************************************************************************************************");
 		w.Writeln (" Declaration of struct arrays");
 		w.Writeln ("**************************************************************************************************************************)");
@@ -207,6 +180,33 @@ func writePascalBaseTypeDefinitions(componentdefinition ComponentDefinition, w L
 
 		w.Writeln ("");
 	}
+
+	if len(componentdefinition.Functions) > 0 {
+		w.Writeln ("(*************************************************************************************************************************");
+		w.Writeln (" Declaration of function types");
+		w.Writeln ("**************************************************************************************************************************)");
+		w.Writeln ("");
+		for i := 0; i < len(componentdefinition.Functions); i++ {
+			funcinfo := componentdefinition.Functions[i];
+			arguments := ""
+			for j := 0; j<len(funcinfo.Params); j++ {
+				param := funcinfo.Params[j]
+				if (arguments != "") {
+					arguments = arguments + "; "
+				}
+				cParams, err := generatePlainPascalParameter(param, "", funcinfo.FunctionName, NameSpace)
+				if (err != nil) {
+					return err
+				}
+				arguments = arguments + cParams[0].ParamConvention + cParams[0].ParamName + ": " + cParams[0].ParamType
+			}
+
+			w.Writeln ("  P%s_%s = function(%s): Integer;", NameSpace, funcinfo.FunctionName, arguments);
+		}
+	}
+	
+	w.Writeln ( "");
+
 	return nil;
 }
 
diff --git a/Source/languagewriter.go b/Source/languagewriter.go
@@ -132,27 +132,27 @@ func (writer *LanguageWriter) WritePythonLicenseHeader (component ComponentDefin
 	writeLicenseHeaderEx (writer.Writer, component, abstract, includeVersion, "'''", "'''");
 }
 
-
+// WritePlainLicenseHeader writes a license header into a writer without comments
+func (writer *LanguageWriter) WritePlainLicenseHeader (component ComponentDefinition, abstract string, includeVersion bool) {
+	writeLicenseHeaderEx (writer.Writer, component, abstract, includeVersion, "", "");
+}
 
 // WriteLicenseHeader writes a license header into a writer with C-style comments
 func WriteLicenseHeader (w io.Writer, component ComponentDefinition, abstract string, includeVersion bool) {
 	writeLicenseHeaderEx (w, component, abstract, includeVersion, "/*", "*/");
 }
 
-// WritePascalLicenseHeader writes a license header into a writer Pascal-style comments
-func WritePascalLicenseHeader (w io.Writer, component ComponentDefinition, abstract string, includeVersion bool) {
-	writeLicenseHeaderEx (w, component, abstract, includeVersion, "(*", "*)");
-}
-
 // writeLicenseHeaderEx writes a license header into a writer.
 func writeLicenseHeaderEx (w io.Writer, component ComponentDefinition, abstract string, includeVersion bool, CommandStart string, CommandEnd string) {
 	ACTVersion := component.ACTVersion;
 	version := component.Version;
 	copyright := component.Copyright;
 	year := component.Year;
 
-	fmt.Fprintf (w, "%s++\n", CommandStart);
-	fmt.Fprintf (w, "\n");
+	if (len(CommandStart) > 0) {
+		fmt.Fprintf (w, "%s++\n", CommandStart);
+		fmt.Fprintf (w, "\n");
+	}
 	fmt.Fprintf (w, "Copyright (C) %d %s\n", year, copyright);
 	fmt.Fprintf (w, "\n");
 	for i := 0; i < len(component.License.Lines); i++ {
@@ -164,13 +164,17 @@ func writeLicenseHeaderEx (w io.Writer, component ComponentDefinition, abstract
 		fmt.Fprintf (w, "This file has been generated by the Automatic Component Toolkit (ACT) version %s.\n", ACTVersion)
 		fmt.Fprintf (w, "\n");
 	}
-	fmt.Fprintf (w, "Abstract: %s\n", abstract);
-	if (includeVersion) {
-		fmt.Fprintf (w, "\nInterface version: %d.%d.%d\n", majorVersion(version), minorVersion(version), microVersion(version))
+	if (len(abstract) > 0 ) {
+		fmt.Fprintf (w, "Abstract: %s\n", abstract);
+		if (includeVersion) {
+			fmt.Fprintf (w, "\nInterface version: %d.%d.%d\n", majorVersion(version), minorVersion(version), microVersion(version))
+		}
 	}
 	fmt.Fprintf (w, "\n");
-	fmt.Fprintf (w, "%s\n", CommandEnd);
+	if (len(CommandEnd) > 0) {
+		fmt.Fprintf (w, "%s\n", CommandEnd);
 	fmt.Fprintf (w, "\n");
+	}
 }
 
 
