flora-commits Mailing List for Flora-2

Update of /cvsroot/flora/flora2/lib
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17036/lib

Modified Files:
	flrtypeconstraint.flr 
Log Message:
make sure system modules are not type-checked


Index: flrtypeconstraint.flr
===================================================================
RCS file: /cvsroot/flora/flora2/lib/flrtypeconstraint.flr,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- flrtypeconstraint.flr	15 Feb 2007 01:33:16 -0000	1.17
+++ flrtypeconstraint.flr	1 May 2008 07:37:24 -0000	1.18
@@ -154,6 +154,7 @@
 	
 // wrong type, nondefault, nonstrict
 Type[%typeCheckInternal(allsigns,?)(?Class,?Method,?Module,?Result)] :- 
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
 	?O[?Method->?Val, ?Method=>?Type]@?Module,
@@ -164,6 +165,7 @@
 
 // missing type, nondefault sign, strict
 Type[%typeCheckInternal(allsigns,strict)(?Class,?Method,?Module,?Result)] :-
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
         (?O[?Method -> ?Val], not ?O[?Method => ?])@?Module,
@@ -173,6 +175,7 @@
 
 // wrong type, default sign, nonstrict
 Type[%typeCheckInternal(?,?)(?Class,?Method,?Module,?Result)] :- 
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
 	?O[?Method*->?Val, ?Method*=>?Type]@?Module,
@@ -183,6 +186,7 @@
 
 // missing type, default sign, strict (not checked if nonstrict)
 Type[%typeCheckInternal(?,strict)(?Class,?Method,?Module,?Result)] :-
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
         (?O[?Method *-> ?Val], not ?O[?Method *=> ?])@?Module,
@@ -195,6 +199,7 @@
 // Same for Boolean methods
 // wrong type, nondefault, nonstrict
 Type[%typeCheckBoolInternal(allsigns,?)(?Class,?Method,?Module,?Result)] :- 
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
 	?O[?Method]@?Module,
@@ -207,6 +212,7 @@
 
 // missing type, nondefault sign, strict
 Type[%typeCheckBoolInternal(allsigns,strict)(?Class,?Method,?Module,?Result)] :-
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
         ?O[?Method]@?Module,
@@ -218,6 +224,7 @@
 
 // wrong type, default sign, nonstrict
 Type[%typeCheckBoolInternal(?,?)(?Class,?Method,?Module,?Result)] :- 
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
 	?O[*?Method]@?Module,
@@ -230,6 +237,7 @@
 
 // missing type, default sign, strict (not checked if nonstrict)
 Type[%typeCheckBoolInternal(?,strict)(?Class,?Method,?Module,?Result)] :-
+	\+ flora_system_module(?Module)@_prolog(flrlibman),
         Method[%_mustDefine(?Stat(?Module))]@_sys,
         Method[%_mustDefine(off(?Module))]@_sys,
         ?O[*?Method]@?Module,

Update of /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15641/hw1-sol

Modified Files:
	queries.flr project.flr employee.flr division.flr company.flr 
Log Message:
improved type checking


Index: company.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol/company.flr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- company.flr	12 Jun 2007 22:44:34 -0000	1.4
+++ company.flr	1 May 2008 07:34:59 -0000	1.5
@@ -1,4 +1,7 @@
 
+?X:?C :- ?X:?C@divisions.
+?X:?C :- ?X:?C@employees.
+
 // Note that we use *=> to give types to attributes.
 // These types will be inherited to instances as => 
 // See query.flr for the type-checking rules.

Index: queries.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol/queries.flr,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- queries.flr	1 May 2008 01:08:59 -0000	1.8
+++ queries.flr	1 May 2008 07:34:58 -0000	1.9
@@ -45,7 +45,7 @@
 // ?- type_error(?O,?M,?V).
 
 // Type checking using the _typecheck module
-// ?- Type[%_check(?[?=>?]@employees, ?Violations)]@_typecheck.
+// ?- Type[%_check(?[?=>?]@?, ?Violations)]@_typecheck.
 /* Answers:
    ?Violations = (${bob[projects -> f1]@employees}, ${bob[projects => project]@employees})
 

Index: project.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol/project.flr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- project.flr	12 Jun 2007 22:44:34 -0000	1.4
+++ project.flr	1 May 2008 07:34:59 -0000	1.5
@@ -1,4 +1,5 @@
 
+?X:?C :- ?X:?C@employees.
 
 // Note that we use *=> to give types for attributes.
 // These types will be inherited to instances as =>

Index: division.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol/division.flr,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- division.flr	12 Jun 2007 22:41:58 -0000	1.3
+++ division.flr	1 May 2008 07:34:59 -0000	1.4
@@ -1,4 +1,5 @@
 
+?X:?C :- ?X:?C@employees.
 
 // Note that we use *=> to give types for attributes.
 // These types will be inherited to instances as =>

Index: employee.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol/employee.flr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- employee.flr	29 Apr 2008 17:36:59 -0000	1.6
+++ employee.flr	1 May 2008 07:34:59 -0000	1.7
@@ -1,8 +1,7 @@
 
-:- importmodule divisions.
-
 // importing only the : relationship from projects module
 ?X:?C :- ?X:?C@projects.
+?X:?C :- ?X:?C@divisions.
 
 // Note that we use *=> to give types to attributes.
 // These types will be inherited to instances as =>

Update of /cvsroot/flora/flora-website/tutorial/homeworks/hw2-sol
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15641/hw2-sol

Modified Files:
	temporal.flr 
Log Message:
improved type checking


Index: temporal.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw2-sol/temporal.flr,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- temporal.flr	12 Jun 2007 23:18:16 -0000	1.5
+++ temporal.flr	1 May 2008 07:34:58 -0000	1.6
@@ -1,7 +1,7 @@
 // This is a time ontology that deals with dates and semesters
 // (For the purposes of this example, only the semester ontology is needed.)
 
-:- ignore_depchk %abort(?_)@?M,
+:- ignore_depchk %abort(?_)@?,
 	         %base_before(?_,?_).
 
 fall(?_Year)   : semester.

Update of /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12928

Modified Files:
	queries.flr 
Log Message:
small improvements


Index: queries.flr
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/homeworks/hw1-sol/queries.flr,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- queries.flr	30 Apr 2008 20:54:58 -0000	1.7
+++ queries.flr	1 May 2008 01:08:59 -0000	1.8
@@ -17,16 +17,16 @@
 // Projects that have employees who work for company divisions
 // that are different from the project's division.
 ?- ?:project[name->?P,
-	     participants-> ?E[division->?EDiv]@employees,
-	     division->?PDiv]@projects,
-   ?EDiv != ?PDiv.
+	     participants-> ?_E[division->?_EDiv]@employees,
+	     division->?_PDiv]@projects,
+   ?_EDiv != ?_PDiv.
 
 // The names of all divisions that have the lowest average
 // salary per employee among all the divisions of the same company
-?- ?Div:division[name->?N]@divisions,
+?- ?Div:division[name->?_N]@divisions,
    avg{?_Sal| ?_Sal = (?Div.employees@divisions).salary@employees}
    = 
-   max{?_AvgSal|
+   min{?_AvgSal|
 	  ?_AvgSal = avg{?_Sal[?_Div1]|
 	                  ?:company[divisions->{?Div,?_Div1}]@companies,
 	                  ?_Sal= (?_Div1.employees@divisions).salary@employees}