Merge remote-tracking branch 'alexis/sort_downloads'

Conflicts:
	lib/standard/collection/abstract_collection.nit
	tests/testfull.sh

diff --cc lib/standard/collection/abstract_collection.nit
index 852d6a2,444da54..086098f
--- 1/lib/standard/collection/abstract_collection.nit
--- 2/lib/standard/collection/abstract_collection.nit
+++ b/lib/standard/collection/abstract_collection.nit
@@@ -261,12 -238,19 +261,19 @@@ interface Set[E: Object
        redef fun remove_all(item) do remove(item)
  end
  
 -# MapRead are abstract associative collections: `key' -> `item'.
 +# MapRead are abstract associative collections: `key` -> `item`.
  interface MapRead[K: Object, E]
 -      # Get the item at `key'.
 +      # Get the item at `key`.
        fun [](key: K): E is abstract
  
+       # Get the item at `key` or return `default` if not in map
+       fun get_or_default(key: K, default: E): E
+       do
+               if has_key(key) then return self[key]
+               return default
+       end
+ 
 -      # Depreciated alias for `keys.has'
 +      # Depreciated alias for `keys.has`
        fun has_key(key: K): Bool do return self.keys.has(key)
  
        # Get a new iterator on the map.

diff --cc lib/standard/file.nit
Simple merge

diff --cc lib/standard/string_search.nit
Simple merge

diff --cc tests/testfull.sh
index 3b2fef7,1261196..f817bad
--- 1/tests/testfull.sh
--- 2/tests/testfull.sh
+++ b/tests/testfull.sh
@@@ -6,4 -6,4 +6,4 @@@ d
        y="$x/$bx.nit"
        test -f $y && list="$list $y"
  done
- ./tests.sh "$@" *.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit $list ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit ../src/nitx.nit ../src/ni_nitdoc.nit ../src/netdbg.nit
 -./tests.sh "$@" *.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit $list ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit ../contrib/sort_downloads/src/sort_downloads.nit
++./tests.sh "$@" *.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit $list ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit ../src/nitx.nit ../src/ni_nitdoc.nit ../src/netdbg.nit ../contrib/sort_downloads/src/sort_downloads.nit