Expanded Class.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@44 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: x97davka

modeq/class.rml

@@ -20,36 +20,43 @@ and	 Modification = CLASSMOD of ElementArg list
 		      | EQUALMOD of Exp.Exp
 
 and	 ElementSpec = CLASSDEF of bool		(* replaceable *)
-				   * Class
+				 * Class
 		     | EXTENDS of string * ElementArg list
 		     | COMPONENT of bool	(* flow *)
 				  * bool	(* parameter *)
 				  * bool	(* constant *)
 				  * bool	(* input *)
 				  * bool	(* output *)
-				  * string	(* type name *)
-				  * string	(* component name *)
+				  * Exp.Path	(* type name *)
+				  * Exp.Ident	(* component name *)
 				  * ArrayDim option
-				  * Modification option (* optional? *)
+				  * Modification option
 
 and	 Element = ELEMENT of bool		(* final *)
 			    * ElementSpec
 
-and	 ElementListType = PUBLIC
-			 | PROTECTED
-			 | EQUATION
-			 | ALGORITHM
-
 and	 ClassRestriction = CL_CLASS
-			  | CL_TYPE
-			  | CL_CONNECTOR
 			  | CL_MODEL
+			  | CL_RECORD
 			  | CL_BLOCK
+			  | CL_CONNECTOR
+			  | CL_TYPE
 			  | CL_PACKAGE
 			  | CL_FUNCTION
 
-and	 Class = CLASS of ClassRestriction*(ElementList list)
+and	 Class = CLASS of Exp.Ident             (* Name *)
+			* bool			(* Partial *)
+			* ClassRestriction      (* Restricion *)
+			* (ClassPart list)      (* Parts *)
+
+and	 ClassPart = PUBLIC of Element list
+		   | PROTECTED of Element list
+		   | EQUATIONS of Equation list
+		   | ALGORITHMS of Algorithm list
+
+and	 Equation = EQ_EXPR of Exp.Exp (* more later *)
+		  | EQ_ASSIGN of Exp.Exp * Exp.Exp
 
-withtype ElementList = ElementListType*(Element list)
+and	 Algorithm = ALGORITHM (* Fill in later *)
 
 end (* module Class *)