use type ImportQualified instead of Bool for fields import_qualified and ei_qualified

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1899 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d

5 files changed, 10 insertions, 8 deletions

diff --git a/frontend/explicitimports.dcl b/frontend/explicitimports.dcl
index 0ffc679..952cc59 100644
--- a/frontend/explicitimports.dcl
+++ b/frontend/explicitimports.dcl
@@ -11,7 +11,7 @@ import syntax, checksupport
 		ei_module_n :: !Int,
 		ei_position :: !Position,
 		ei_symbols  :: ![ImportNrAndIdents],
-		ei_qualified:: !Bool
+		ei_qualified:: !ImportQualified
 	}
 
 :: SolvedImports =
diff --git a/frontend/explicitimports.icl b/frontend/explicitimports.icl
index 6e38f6c..eb91f69 100644
--- a/frontend/explicitimports.icl
+++ b/frontend/explicitimports.icl
@@ -114,8 +114,8 @@ solveExplicitImports :: !(IntKeyHashtable [ExplicitImport]) !{#Int} !Index
 			-> (!.SolvedImports,! (!v:{#DclModule},!.{#Int},!{!.ExplImpInfo},!.CheckState))
 solveExplicitImports expl_imp_indices_ikh modules_in_component_set importing_mod (dcl_modules, visited_modules, expl_imp_info, cs)
 	# import_indices = ikhSearch` importing_mod expl_imp_indices_ikh
-	  expl_imp_indices = [ imports \\ imports=:{ei_symbols=[_:_],ei_qualified=False} <- import_indices ]
-	  qualified_expl_imp_indices = [ imports \\ imports=:{ei_symbols=[_:_],ei_qualified=True} <- import_indices ]
+	  expl_imp_indices = [ imports \\ imports=:{ei_symbols=[_:_],ei_qualified=NotQualified} <- import_indices ]
+	  qualified_expl_imp_indices = [ imports \\ imports=:{ei_symbols=[_:_],ei_qualified=Qualified} <- import_indices ]
 	  impl_imports = [ (ei_module_n,ei_position) \\ imports=:{ei_module_n,ei_position,ei_symbols=[]} <- import_indices ]
 	  state = (dcl_modules, visited_modules, expl_imp_info, cs)
 	  path = [importing_mod]
diff --git a/frontend/parse.icl b/frontend/parse.icl
index 14ec95e..4f4011a 100644
--- a/frontend/parse.icl
+++ b/frontend/parse.icl
@@ -1083,7 +1083,7 @@ wantImports pState
 	  (file_name, line_nr, pState)	= getFileAndLineNr pState
 	  pState = wantEndOfDefinition "imports" pState
 	  position = LinePos file_name line_nr
-	= ([ { import_module = name, import_symbols = [], import_file_position = position, import_qualified = False }
+	= ([ { import_module = name, import_symbols = [], import_file_position = position, import_qualified = NotQualified }
 			\\ name<-names], pState)
 
 wantFromImports :: !ParseState -> (!ParsedImport, !ParseState)
@@ -1097,11 +1097,11 @@ wantFromImports pState
 		# (import_symbols, pState) = wantImportDeclarations pState
 		  pState = wantEndOfDefinition "from imports" pState
 		= ( { import_module = mod_ident, import_symbols = import_symbols,
-			  import_file_position = LinePos file_name line_nr, import_qualified = True }, pState)
+			  import_file_position = LinePos file_name line_nr, import_qualified = Qualified }, pState)
 	# (import_symbols, pState) = wantImportDeclarationsT token pState
 	  pState = wantEndOfDefinition "from imports" pState
 	= ( { import_module = mod_ident, import_symbols = import_symbols,
-		  import_file_position = LinePos file_name line_nr, import_qualified = False }, pState)
+		  import_file_position = LinePos file_name line_nr, import_qualified = NotQualified }, pState)
 where
 	wantImportDeclarations pState
 		# (token, pState) = nextToken GeneralContext pState
diff --git a/frontend/postparse.icl b/frontend/postparse.icl
index 29b3a03..4c5a9ef 100644
--- a/frontend/postparse.icl
+++ b/frontend/postparse.icl
@@ -1473,7 +1473,7 @@ reorganiseDefinitionsAndAddTypes mod_ident support_dynamics icl_module defs ca
 			{	import_module = clean_types_module_ident
 			,	import_symbols = []
 			,	import_file_position = NoPos
-			,	import_qualified = False
+			,	import_qualified = NotQualified
 			}
 		# imports = if (mod_ident == clean_types_module_ident) [] [clean_types_module]
 		= reorganiseDefinitions icl_module [PD_Import imports : defs] 0 0 0 0 ca
diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl
index c585a1f..0e01bde 100644
--- a/frontend/syntax.dcl
+++ b/frontend/syntax.dcl
@@ -462,9 +462,11 @@ cNameLocationDependent :== True
 	{	import_module		:: !Ident
 	,	import_symbols		:: ![ImportDeclaration]
 	,	import_file_position:: !Position	// for error messages
-	,	import_qualified	:: !Bool
+	,	import_qualified	:: !ImportQualified
 	}
 
+::	ImportQualified = NotQualified | Qualified
+
 instance toString Import, AttributeVar, TypeAttribute, Annotation
 
 ::	ParsedImport		:== Import