diff options
author | johnvg | 2002-06-17 11:29:50 +0000 |
---|---|---|
committer | johnvg | 2002-06-17 11:29:50 +0000 |
commit | 2503354503ecdd697bb1dbea7c9fb8fee3f77ae6 (patch) | |
tree | 3abf7a922862ca12c2c78a3fc03220290f8e9549 | |
parent | removed hello and bye, replace testArgs by [] (diff) |
removed ingnored !'s
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1097 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
-rw-r--r-- | frontend/checksupport.icl | 2 | ||||
-rw-r--r-- | frontend/hashtable.dcl | 2 | ||||
-rw-r--r-- | frontend/hashtable.icl | 2 | ||||
-rw-r--r-- | frontend/scanner.dcl | 4 | ||||
-rw-r--r-- | frontend/scanner.icl | 8 | ||||
-rw-r--r-- | frontend/typeproperties.dcl | 4 | ||||
-rw-r--r-- | frontend/typeproperties.icl | 6 | ||||
-rw-r--r-- | frontend/utilities.dcl | 2 | ||||
-rw-r--r-- | frontend/utilities.icl | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/frontend/checksupport.icl b/frontend/checksupport.icl index 173db80..7bded09 100644 --- a/frontend/checksupport.icl +++ b/frontend/checksupport.icl @@ -295,7 +295,7 @@ removeImportsAndLocalsOfModuleFromSymbolTable {dcls_import,dcls_local_for_import # symbol_table = remove_declared_symbols_in_array 0 dcls_import symbol_table = remove_declared_symbols_in_array 0 dcls_local_for_import symbol_table where - remove_declared_symbols_in_array :: !Int !{!Declaration} !*SymbolTable -> !*SymbolTable + remove_declared_symbols_in_array :: !Int !{!Declaration} !*SymbolTable -> *SymbolTable remove_declared_symbols_in_array symbol_index symbols symbol_table | symbol_index<size symbols # symbol = symbols.[symbol_index] diff --git a/frontend/hashtable.dcl b/frontend/hashtable.dcl index 7aab4e2..801117f 100644 --- a/frontend/hashtable.dcl +++ b/frontend/hashtable.dcl @@ -29,6 +29,6 @@ set_hte_mark :: !Int !*HashTable -> *HashTable :: BoxedIdent = {boxed_ident::!Ident} putIdentInHashTable :: !String !IdentClass !*HashTable -> (!BoxedIdent, !*HashTable) -putPredefinedIdentInHashTable :: !Ident !IdentClass !*HashTable -> !*HashTable +putPredefinedIdentInHashTable :: !Ident !IdentClass !*HashTable -> *HashTable remove_icl_symbols_from_hash_table :: !*HashTable -> *HashTable diff --git a/frontend/hashtable.icl b/frontend/hashtable.icl index 3abe810..1c2d8a3 100644 --- a/frontend/hashtable.icl +++ b/frontend/hashtable.icl @@ -108,7 +108,7 @@ where #! (boxed_ident, hte_symbol_heap, hte_right) = insert name ident_class hte_mark0 hte_symbol_heap hte_right = (boxed_ident, hte_symbol_heap, HTE_Ident hte_ident hte_class hte_mark hte_left hte_right) -putPredefinedIdentInHashTable :: !Ident !IdentClass !*HashTable -> !*HashTable +putPredefinedIdentInHashTable :: !Ident !IdentClass !*HashTable -> *HashTable putPredefinedIdentInHashTable predefined_ident=:{id_name} ident_class {hte_symbol_heap,hte_entries,hte_mark} # hash_val = hashValue id_name (entries,hte_entries) = replace hte_entries hash_val HTE_Empty diff --git a/frontend/scanner.dcl b/frontend/scanner.dcl index 88a919e..1a5f057 100644 --- a/frontend/scanner.dcl +++ b/frontend/scanner.dcl @@ -10,7 +10,7 @@ import StdEnv, general } :: ModTimeFunction f - :== ({#Char} !f -> *(!{#Char}, !f)) + :== ({#Char} f -> *(!{#Char}, !f)) // ... RWS @@ -129,7 +129,7 @@ instance <<< FilePosition class getFilename state :: !*state -> (!String,!*state) instance getFilename ScanState -class tokenBack state :: !*state -> !*state +class tokenBack state :: !*state -> *state instance tokenBack ScanState class nextToken state :: !ScanContext !*state -> (!Token, !*state) diff --git a/frontend/scanner.icl b/frontend/scanner.icl index 5930c1e..a6434c6 100644 --- a/frontend/scanner.icl +++ b/frontend/scanner.icl @@ -11,7 +11,7 @@ from utilities import revCharListToString, isSpecialChar } :: ModTimeFunction f - :== ({#Char} !f -> *(!{#Char}, !f)) + :== ({#Char} f -> *(!{#Char}, !f)) // ... RWS @@ -380,7 +380,7 @@ where mark_poistion input = input nextToken _ _ = abort "Scanner: Error in nextToken" -class tokenBack state :: !*state -> !*state +class tokenBack state :: !*state -> *state instance tokenBack RScanState where @@ -565,7 +565,7 @@ scan_comment_in_line i fp_col fp_line line tabsize stream inp_filename , inp_pos = {fp_line=fp_line, fp_col = fp_col} } -SkipToEndOfLine :: !Input -> !Input +SkipToEndOfLine :: !Input -> Input SkipToEndOfLine input=:{inp_stream=OldLine i line stream,inp_pos={fp_line,fp_col}} | i<size line = {input & inp_stream=stream,inp_pos={fp_line=fp_line+1,fp_col=0}} @@ -1021,7 +1021,7 @@ ScanChar input chars | '\\' == c = ScanBSChar 0 chars input ScanEndOfChar = ScanEndOfChar 1 [c: chars] input -ScanBSChar :: !Int ![Char] !Input (!Int ![Char] !Input -> (!Token, !Input)) -> (!Token, !Input) +ScanBSChar :: !Int ![Char] !Input (Int [Char] Input -> (!Token, !Input)) -> (!Token, !Input) ScanBSChar n chars input cont # (eof, c, input) = ReadNormalChar input | eof = cont n chars input diff --git a/frontend/typeproperties.dcl b/frontend/typeproperties.dcl index 430aba9..2ca4990 100644 --- a/frontend/typeproperties.dcl +++ b/frontend/typeproperties.dcl @@ -52,5 +52,5 @@ instance * Sign retrieveSignClassification :: ![SignClassification] !TypeClassification -> Optional (TypeSign [SignClassification]) retrievePropClassification :: ![PropClassification] !TypeClassification -> Optional (TypeProp [PropClassification]) -addSignClassification :: ![SignClassification] !SignClassification !TypeClassification -> !TypeClassification -addPropClassification :: ![PropClassification] !PropClassification !TypeClassification -> !TypeClassification +addSignClassification :: ![SignClassification] !SignClassification !TypeClassification -> TypeClassification +addPropClassification :: ![PropClassification] !PropClassification !TypeClassification -> TypeClassification diff --git a/frontend/typeproperties.icl b/frontend/typeproperties.icl index d646e06..5f6e04d 100644 --- a/frontend/typeproperties.icl +++ b/frontend/typeproperties.icl @@ -81,7 +81,7 @@ treeInsert new_key new_el tree=:(BT_Node el left right) = BT_Node el (treeInsert new_key new_el left) right = BT_Node el left (treeInsert new_key new_el right) -treeRetrieve :: !k !(BinTree (m k)) -> !Optional (m k) | =< k & key m +treeRetrieve :: !k !(BinTree (m k)) -> Optional (m k) | =< k & key m treeRetrieve search_key BT_Empty = No treeRetrieve search_key tree=:(BT_Node el left right) @@ -124,7 +124,7 @@ retrieveSignClassification :: ![SignClassification] !TypeClassification -> Optio retrieveSignClassification cons_classes {tc_signs} = treeRetrieve cons_classes tc_signs -addSignClassification :: ![SignClassification] !SignClassification !TypeClassification -> !TypeClassification +addSignClassification :: ![SignClassification] !SignClassification !TypeClassification -> TypeClassification addSignClassification hio_signs sign_class tc=:{tc_signs} = { tc & tc_signs = treeInsert hio_signs { ts_cons_var_signs = hio_signs, ts_type_sign = sign_class } tc_signs } @@ -132,7 +132,7 @@ retrievePropClassification :: ![PropClassification] !TypeClassification -> Optio retrievePropClassification cons_classes {tc_props} = treeRetrieve cons_classes tc_props -addPropClassification :: ![PropClassification] !PropClassification !TypeClassification -> !TypeClassification +addPropClassification :: ![PropClassification] !PropClassification !TypeClassification -> TypeClassification addPropClassification hio_props prop_class tc=:{tc_props} = { tc & tc_props = treeInsert hio_props { ts_cons_var_props = hio_props, ts_type_prop = prop_class } tc_props } diff --git a/frontend/utilities.dcl b/frontend/utilities.dcl index 8df39e2..1d3967b 100644 --- a/frontend/utilities.dcl +++ b/frontend/utilities.dcl @@ -65,7 +65,7 @@ map2St f l1 l2 st :== map2_st l1 l2 st app2St :: !(!.(.a -> .(.st -> (.c,.st))),!.(.e -> .(.st -> (.f,.st)))) !(.a,.e) !.st -> (!(.c,.f),!.st) -mapAppendSt :: !(.a -> .(.b -> (.c,.b))) ![.a] !u:[.c] !.b -> !(!u:[.c],!.b) +mapAppendSt :: !(.a -> .(.b -> (.c,.b))) ![.a] !u:[.c] !.b -> (!u:[.c],!.b) strictMap :: !(.a -> .b) ![.a] -> [.b] diff --git a/frontend/utilities.icl b/frontend/utilities.icl index 48a5012..efcd741 100644 --- a/frontend/utilities.icl +++ b/frontend/utilities.icl @@ -113,7 +113,7 @@ mapAppend f [] tail = tail -mapAppendSt :: !(.a -> .(.b -> (.c,.b))) ![.a] !u:[.c] !.b -> !(!u:[.c],!.b) +mapAppendSt :: !(.a -> .(.b -> (.c,.b))) ![.a] !u:[.c] !.b -> (!u:[.c],!.b) mapAppendSt f [x : xs] tail s # (x, s) = f x s (xs, s) = mapAppendSt f xs tail s |