From 98d08f8c0896992dc9c4d41d20ce597eaffedc6b Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Wed, 26 Aug 2015 15:00:15 -0400
Subject: [PATCH] code: update references to `standard`

Signed-off-by: Jean Privat <jean@pryen.org>
---
 contrib/online_ide/sources/nit/pnacl_nit.nit  |    2 +-
 contrib/pep8analysis/src/pep8analysis_web.nit |    2 +-
 examples/int_stack.nit                        |    2 +-
 examples/mnit_dino/src/game_logic.nit         |    2 +-
 lib/android/notification/notification.nit     |    2 +-
 lib/app/audio.nit                             |    2 +-
 lib/buffered_ropes.nit                        |    2 +-
 lib/c.nit                                     |    4 ++--
 lib/core/fixed_ints.nit                       |    8 ++++----
 lib/core/re.nit                               |    2 +-
 lib/curl/native_curl.nit                      |    4 ++--
 lib/hash_debug.nit                            |    4 ++--
 lib/html/html.nit                             |    4 ++--
 lib/mpi.nit                                   |    2 +-
 lib/nitcorn/http_request.nit                  |    2 +-
 lib/pnacl.nit                                 |    4 ++--
 lib/ropes_debug.nit                           |    4 ++--
 lib/saxophonit/saxophonit.nit                 |    2 +-
 lib/serialization/engine_tools.nit            |    2 +-
 lib/socket/socket.nit                         |    2 +-
 lib/sqlite3/sqlite3.nit                       |    2 +-
 lib/websocket/websocket.nit                   |    4 ++--
 src/doc/doc_phases/doc_console.nit            |    2 +-
 src/interpreter/primitive_types.nit           |    4 ++--
 src/model/model.nit                           |    2 +-
 25 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/contrib/online_ide/sources/nit/pnacl_nit.nit b/contrib/online_ide/sources/nit/pnacl_nit.nit
index 2017a0b..ed8151d 100644
--- a/contrib/online_ide/sources/nit/pnacl_nit.nit
+++ b/contrib/online_ide/sources/nit/pnacl_nit.nit
@@ -22,7 +22,7 @@ import interpreter::debugger
 import pnacl
 intrude import toolcontext
 intrude import loader
-intrude import standard::file
+intrude import core::file
 
 # We redefine exit to start a new thread before killing the one that called exit.
 redef fun exit(exit_value: Int)
diff --git a/contrib/pep8analysis/src/pep8analysis_web.nit b/contrib/pep8analysis/src/pep8analysis_web.nit
index 4d9d0aa..8f5c97a 100644
--- a/contrib/pep8analysis/src/pep8analysis_web.nit
+++ b/contrib/pep8analysis/src/pep8analysis_web.nit
@@ -31,7 +31,7 @@ import ast
 import model
 import cfg
 import flow_analysis
-intrude import standard::stream
+intrude import core::stream
 import cpp
 
 in "C++" `{
diff --git a/examples/int_stack.nit b/examples/int_stack.nit
index 1109bbb..eb2d9b3 100644
--- a/examples/int_stack.nit
+++ b/examples/int_stack.nit
@@ -19,7 +19,7 @@ module int_stack
 
 # A stack of integer implemented by a simple linked list.
 # Note that this is only a toy class since a real linked list will gain to use
-# generics and extends interfaces, like Collection, from the standard library.
+# generics and extends interfaces, like `Collection`, from the `core` library.
 class IntStack
 	# The head node of the list.
 	# Null means that the stack is empty.
diff --git a/examples/mnit_dino/src/game_logic.nit b/examples/mnit_dino/src/game_logic.nit
index 29712de..6fa0d3f 100644
--- a/examples/mnit_dino/src/game_logic.nit
+++ b/examples/mnit_dino/src/game_logic.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Entire game logic for the Dino game
-# Depends only on Nit standard library
+# Depends only on Nit `core` library
 module game_logic
 
 interface Turnable
diff --git a/lib/android/notification/notification.nit b/lib/android/notification/notification.nit
index a4d34d4..efd7c5f 100644
--- a/lib/android/notification/notification.nit
+++ b/lib/android/notification/notification.nit
@@ -35,7 +35,7 @@
 # http://developer.android.com/guide/topics/ui/notifiers/notifications.html
 module notification
 
-import standard
+import core
 private import native_notification
 
 # An Android notification, shown at the top of the screen
diff --git a/lib/app/audio.nit b/lib/app/audio.nit
index 759ed81..42d90ae 100644
--- a/lib/app/audio.nit
+++ b/lib/app/audio.nit
@@ -24,7 +24,7 @@
 module audio
 
 import app_base
-import standard::error
+import core::error
 
 # Platform variations
 # TODO: move on the platform once qualified names are understand in the condition
diff --git a/lib/buffered_ropes.nit b/lib/buffered_ropes.nit
index 1f92337..8ed1f6b 100644
--- a/lib/buffered_ropes.nit
+++ b/lib/buffered_ropes.nit
@@ -22,7 +22,7 @@
 # and reallocations when concatenating `String` objects.
 module buffered_ropes
 
-intrude import standard::text::ropes
+intrude import core::text::ropes
 
 # Hidden buffer, used to simulate a `FlatBuffer` on a short string.
 #
diff --git a/lib/c.nit b/lib/c.nit
index 04f7b20..a4a8e01 100644
--- a/lib/c.nit
+++ b/lib/c.nit
@@ -16,8 +16,8 @@
 
 # Utilities and performant structure for the FFI with C
 module c
-import standard
-intrude import standard::collection::array
+import core
+intrude import core::collection::array
 
 # A thin wrapper around a `NativeCArray` adding length information
 abstract class CArray[E]
diff --git a/lib/core/fixed_ints.nit b/lib/core/fixed_ints.nit
index daad211..17ef576 100644
--- a/lib/core/fixed_ints.nit
+++ b/lib/core/fixed_ints.nit
@@ -818,7 +818,7 @@ redef class Text
 
 	# Removes the numeric head of `self` if present
 	#
-	#     intrude import standard::fixed_ints
+	#     intrude import core::fixed_ints
 	#     assert "0xFFEF".strip_numhead  == "FFEF"
 	#     assert "0o7364".strip_numhead  == "7364"
 	#     assert "0b01001".strip_numhead == "01001"
@@ -831,7 +831,7 @@ redef class Text
 	# Gets the numeric head of `self` if present
 	# Returns "" otherwise
 	#
-	#     intrude import standard::fixed_ints
+	#     intrude import core::fixed_ints
 	#     assert "0xFEFF".get_numhead  == "0x"
 	#     assert "0b01001".get_numhead == "0b"
 	#     assert "0o872".get_numhead   == "0o"
@@ -848,7 +848,7 @@ redef class Text
 
 	# Removes the numeric extension if present
 	#
-	#     intrude import standard::fixed_ints
+	#     intrude import core::fixed_ints
 	#     assert "0xFEFFu8".strip_numext  == "0xFEFF"
 	#     assert "0b01001u8".strip_numext == "0b01001"
 	#     assert "0o872u8".strip_numext   == "0o872"
@@ -862,7 +862,7 @@ redef class Text
 	# Gets the numeric extension (i/u 8/16/32) in `self` is present
 	# Returns "" otherwise
 	#
-	#     intrude import standard::fixed_ints
+	#     intrude import core::fixed_ints
 	#     assert "0xFEFFu8".get_numext  == "u8"
 	#     assert "0b01001u8".get_numext == "u8"
 	#     assert "0o872u8".get_numext   == "u8"
diff --git a/lib/core/re.nit b/lib/core/re.nit
index 7d588ca..eb74893 100644
--- a/lib/core/re.nit
+++ b/lib/core/re.nit
@@ -35,7 +35,7 @@ in "C Header" `{
 # It is recommanded to use the higher level API offered by the class `Regex`,
 # but it can still be used for advanced purpose or in optimized code.
 #
-# To use this class and other `private` entities of this module, use `intrude import standard::re`
+# To use this class and other `private` entities of this module, use `intrude import core::re`
 private extern class NativeRegex `{ regex_t* `}
 	# Allocate a new `NativeRegex`, it must then be compiled using `regcomp` before calling `regexec`
 	new malloc `{ return malloc(sizeof(regex_t)); `}
diff --git a/lib/curl/native_curl.nit b/lib/curl/native_curl.nit
index dab58bf..8fc9ccb 100644
--- a/lib/curl/native_curl.nit
+++ b/lib/curl/native_curl.nit
@@ -17,8 +17,8 @@
 # Binding of C libCurl which allow us to interact with network.
 module native_curl is pkgconfig "libcurl"
 
-intrude import standard::file
-import standard
+intrude import core::file
+import core
 
 in "C header" `{
 	#include <curl/curl.h>
diff --git a/lib/hash_debug.nit b/lib/hash_debug.nit
index 1626437..75d4160 100644
--- a/lib/hash_debug.nit
+++ b/lib/hash_debug.nit
@@ -29,8 +29,8 @@
 # at callers of `HashCollection::gt_collide` and `HashCollection::st_collide`.
 module hash_debug
 
-intrude import standard::collection::hash_collection
-import standard
+intrude import core::collection::hash_collection
+import core
 
 redef class Sys
 	# Number of calls of `HashCollection::node_at_idx`
diff --git a/lib/html/html.nit b/lib/html/html.nit
index 6a24c07..d3a92eb 100644
--- a/lib/html/html.nit
+++ b/lib/html/html.nit
@@ -246,7 +246,7 @@ class HTMLTag
 	#     var p = new HTMLTag("p")
 	#     p.text("Hello World!")
 	#     assert p.write_to_string      ==  "<p>Hello World!</p>"
-	# Text is escaped see: `standard::String::html_escape`
+	# Text is escaped see: `core::String::html_escape`
 	fun text(txt: String): HTMLTag do
 
 		children.clear
@@ -261,7 +261,7 @@ class HTMLTag
 	#     p.add(new HTMLTag("br"))
 	#     p.append("World!")
 	#     assert p.write_to_string      ==  "<p>Hello<br/>World!</p>"
-	# Text is escaped see: standard::String::html_escape
+	# Text is escaped see: core::String::html_escape
 	fun append(txt: String): HTMLTag do
 		add(new HTMLRaw("", txt.html_escape))
 		return self
diff --git a/lib/mpi.nit b/lib/mpi.nit
index 68e5873..a9e22d8 100644
--- a/lib/mpi.nit
+++ b/lib/mpi.nit
@@ -31,7 +31,7 @@ module mpi is
 end
 
 import c
-intrude import standard::text::flat
+intrude import core::text::flat
 import serialization
 private import json::serialization
 
diff --git a/lib/nitcorn/http_request.nit b/lib/nitcorn/http_request.nit
index f580b54..e99237a 100644
--- a/lib/nitcorn/http_request.nit
+++ b/lib/nitcorn/http_request.nit
@@ -20,7 +20,7 @@
 # Provides the `HttpRequest` class and services to create it
 module http_request
 
-import standard
+import core
 
 # A request received over HTTP, is build by `HttpRequestParser`
 class HttpRequest
diff --git a/lib/pnacl.nit b/lib/pnacl.nit
index 89ff3cf..9483d1a 100644
--- a/lib/pnacl.nit
+++ b/lib/pnacl.nit
@@ -22,8 +22,8 @@
 # 'nacl_sdk/pepper_your_pepper_version/getting_started/your_project_folder'.
 module pnacl is platform
 
-import standard
-intrude import standard::stream
+import core
+intrude import core::stream
 
 in "C Header" `{
 	#include "ppapi/c/pp_errors.h"
diff --git a/lib/ropes_debug.nit b/lib/ropes_debug.nit
index 8482352..874961f 100644
--- a/lib/ropes_debug.nit
+++ b/lib/ropes_debug.nit
@@ -14,8 +14,8 @@
 # Exposes methods for debugging ropes when needed.
 module ropes_debug
 
-import standard
-intrude import standard::text::ropes
+import core
+intrude import core::text::ropes
 
 redef class Text
 	# Writes self as a dot file on the hard drive
diff --git a/lib/saxophonit/saxophonit.nit b/lib/saxophonit/saxophonit.nit
index 19dbb69..2693086 100644
--- a/lib/saxophonit/saxophonit.nit
+++ b/lib/saxophonit/saxophonit.nit
@@ -12,7 +12,7 @@
 module saxophonit
 
 import sax
-intrude import standard::file
+intrude import core::file
 private import reader_model
 private import lexer
 
diff --git a/lib/serialization/engine_tools.nit b/lib/serialization/engine_tools.nit
index 33d36b4..4742ad4 100644
--- a/lib/serialization/engine_tools.nit
+++ b/lib/serialization/engine_tools.nit
@@ -16,7 +16,7 @@
 module engine_tools
 
 import serialization
-intrude import standard::collection::hash_collection
+intrude import core::collection::hash_collection
 
 # Maps instances to a value, uses `is_same_serialized` and `serialization_hash`.
 class StrictHashMap[K, V]
diff --git a/lib/socket/socket.nit b/lib/socket/socket.nit
index a75f7fb..6e036b7 100644
--- a/lib/socket/socket.nit
+++ b/lib/socket/socket.nit
@@ -18,7 +18,7 @@
 module socket
 
 private import socket_c
-intrude import standard::stream
+intrude import core::stream
 
 # A general Socket, either TCP or UDP
 abstract class Socket
diff --git a/lib/sqlite3/sqlite3.nit b/lib/sqlite3/sqlite3.nit
index 023c6c1..40dcdad 100644
--- a/lib/sqlite3/sqlite3.nit
+++ b/lib/sqlite3/sqlite3.nit
@@ -20,7 +20,7 @@
 module sqlite3
 
 private import native_sqlite3
-import standard
+import core
 
 # A connection to a Sqlite3 database
 class Sqlite3DB
diff --git a/lib/websocket/websocket.nit b/lib/websocket/websocket.nit
index 441df14..c3fdaad 100644
--- a/lib/websocket/websocket.nit
+++ b/lib/websocket/websocket.nit
@@ -22,8 +22,8 @@ import socket
 import sha1
 import base64
 
-intrude import standard::stream
-intrude import standard::bytes
+intrude import core::stream
+intrude import core::bytes
 
 # Websocket compatible listener
 #
diff --git a/src/doc/doc_phases/doc_console.nit b/src/doc/doc_phases/doc_console.nit
index 9734ed3..e4f6bb1 100644
--- a/src/doc/doc_phases/doc_console.nit
+++ b/src/doc/doc_phases/doc_console.nit
@@ -269,7 +269,7 @@ redef class ArticleCommand
 
 	redef fun make_results(nitx, results) do
 		var len = results.length
-		# FIXME how to render the pager for one worded namespaces like "standard"?
+		# FIXME how to render the pager for one worded namespaces like "core"?
 		if len == 1 then
 			var page = results.first.as(PageMatch).page
 			var pager = new Pager
diff --git a/src/interpreter/primitive_types.nit b/src/interpreter/primitive_types.nit
index a82e953..4912404 100644
--- a/src/interpreter/primitive_types.nit
+++ b/src/interpreter/primitive_types.nit
@@ -14,8 +14,8 @@
 # underlying implementation and that the services are semantically correct.
 module primitive_types
 
-intrude import standard::file
-intrude import standard::text::flat
+intrude import core::file
+intrude import core::text::flat
 
 # Wrapper for `NativeFile`
 class PrimitiveNativeFile
diff --git a/src/model/model.nit b/src/model/model.nit
index 7812cb2..e0c3280 100644
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -1280,7 +1280,7 @@ class MGenericType
 	redef var to_s: String is noinit
 
 	# The full-name of the class, then the full-name of each type arguments within brackets.
-	# Example: `"standard::Map[standard::String, standard::List[standard::Int]]"`
+	# Example: `"core::Map[core::String, core::List[core::Int]]"`
 	redef var full_name is lazy do
 		var args = new Array[String]
 		for t in arguments do
-- 
1.7.9.5