Commit d6ead98f authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl

Merge remote-tracking branch 'origin/master' into itask

parents dafb2a45 51ad41d0
......@@ -1110,7 +1110,7 @@ where
| FoundObject left_index
= (left_index,predef_symbols)
# (inst_index,predef_symbols) = find_unboxed_array_instance_in_list element_type instances defs predef_symbols
| FoundObject left_index
| FoundObject inst_index
= (inst_index,predef_symbols)
= find_sorted_unboxed_array_instance element_type right defs predef_symbols
find_sorted_unboxed_array_instance element_type SI_Empty defs predef_symbols
......@@ -1155,7 +1155,7 @@ where
| FoundObject left_index
= left_index
# inst_index = find_unboxed_list_instance_in_list element_type instances defs
| FoundObject left_index
| FoundObject inst_index
= inst_index
= find_sorted_unboxed_list_instance element_type right defs
find_sorted_unboxed_list_instance element_type SI_Empty defs
......
......@@ -340,12 +340,19 @@ where
= (False, mod_type, "", tokenBack scanState)
try_module_name (IdentToken name) mod_type scanState
= (True, mod_type, name, scanState)
# allow_underscores = file_name_starts_with_underscore (size name-1) name
= (True, mod_type, name, setUseUnderscoreIdents allow_underscores scanState)
try_module_name (UnderscoreIdentToken name) mod_type scanState
= (True, mod_type, name, setUseUnderscoreIdents True scanState)
# allow_underscores = file_name_starts_with_underscore (size name-1) name
= (True, mod_type, name, setUseUnderscoreIdents allow_underscores scanState)
try_module_name token mod_type scanState
= (False, mod_type, "", tokenBack scanState)
file_name_starts_with_underscore i s
| i>=0 && s.[i]<>'.'
= file_name_starts_with_underscore (i-1) s
= i+1<size s && s.[i+1]=='_'
verify_name name id_name file_name pState
| name == id_name
= pState
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment