From: Jean Privat Date: Wed, 8 Apr 2015 15:51:44 +0000 (+0700) Subject: code: remove `protected` from top-level methods (now in sys) X-Git-Tag: v0.7.4~31^2~3 X-Git-Url: http://nitlanguage.org code: remove `protected` from top-level methods (now in sys) Signed-off-by: Jean Privat --- diff --git a/contrib/pep8analysis/src/backbone.nit b/contrib/pep8analysis/src/backbone.nit index d731e41..251f920 100644 --- a/contrib/pep8analysis/src/backbone.nit +++ b/contrib/pep8analysis/src/backbone.nit @@ -98,4 +98,4 @@ redef class Location end end -protected fun manager: AnalysisManager do return once new AnalysisManager +fun manager: AnalysisManager do return once new AnalysisManager diff --git a/lib/android/intent/intent_api10.nit b/lib/android/intent/intent_api10.nit index 8d84981..d2aa796 100644 --- a/lib/android/intent/intent_api10.nit +++ b/lib/android/intent/intent_api10.nit @@ -1334,11 +1334,11 @@ redef extern class NativeActivity end # Allows user to get values with enum-like syntax : `intent_action.main` -protected fun intent_action: Action do return once new Action +fun intent_action: Action do return once new Action # Allows user to get values with enum-like syntax : `intent_category.home` -protected fun intent_category: Category do return once new Category +fun intent_category: Category do return once new Category # Allows user to get values with enum-like syntax : `intent_flag.activity_brought_to_front` -protected fun intent_flag: Flag do return once new Flag +fun intent_flag: Flag do return once new Flag private class StringCopyArray var collection = new Array[String] diff --git a/lib/android/log.nit b/lib/android/log.nit index c165331..6b0faea 100644 --- a/lib/android/log.nit +++ b/lib/android/log.nit @@ -24,30 +24,30 @@ in "C" `{ `} # Default Android log priority -protected fun priority_default: Int do return 1 +fun priority_default: Int do return 1 # Verbose Android log priority -protected fun priority_verbose: Int do return 2 +fun priority_verbose: Int do return 2 # Debug Android log priority -protected fun priority_debug: Int do return 3 +fun priority_debug: Int do return 3 # Info Android log priority -protected fun priority_info: Int do return 4 +fun priority_info: Int do return 4 # Warn Android log priority -protected fun priority_warn: Int do return 5 +fun priority_warn: Int do return 5 # Error Android log priority -protected fun priority_error: Int do return 6 +fun priority_error: Int do return 6 # Fatal Android log priority -protected fun priority_fatal: Int do return 7 +fun priority_fatal: Int do return 7 # Silent Android log priority -protected fun priority_silent: Int do return 8 +fun priority_silent: Int do return 8 # Write `text` to Android log at priority `level` with tag `tag` -protected fun log_write(level: Int, tag, text: NativeString) `{ +fun log_write(level: Int, tag, text: NativeString) `{ __android_log_write(level, tag, text); `} diff --git a/lib/app/app_base.nit b/lib/app/app_base.nit index f892033..2a335c4 100644 --- a/lib/app/app_base.nit +++ b/lib/app/app_base.nit @@ -52,6 +52,6 @@ class App fun window_closing do end end -protected fun app: App do return once new App +fun app: App do return once new App app.setup app.run diff --git a/lib/egl.nit b/lib/egl.nit index b664c8a..d062cfc 100644 --- a/lib/egl.nit +++ b/lib/egl.nit @@ -452,6 +452,6 @@ redef class Object end end -protected fun egl_bind_opengl_api: Bool `{ return eglBindAPI(EGL_OPENGL_API); `} -protected fun egl_bind_opengl_es_api: Bool `{ return eglBindAPI(EGL_OPENGL_ES_API); `} -protected fun egl_bind_openvg_api: Bool `{ return eglBindAPI(EGL_OPENVG_API); `} +fun egl_bind_opengl_api: Bool `{ return eglBindAPI(EGL_OPENGL_API); `} +fun egl_bind_opengl_es_api: Bool `{ return eglBindAPI(EGL_OPENGL_ES_API); `} +fun egl_bind_openvg_api: Bool `{ return eglBindAPI(EGL_OPENVG_API); `} diff --git a/lib/glesv2/glesv2.nit b/lib/glesv2/glesv2.nit index de2babc..5b05f8b 100644 --- a/lib/glesv2/glesv2.nit +++ b/lib/glesv2/glesv2.nit @@ -366,7 +366,7 @@ extern class GLError end end -protected fun assert_no_gl_error +fun assert_no_gl_error do var error = gl.error if not error.is_ok then diff --git a/lib/signals.nit b/lib/signals.nit index f9709da..58482a8 100644 --- a/lib/signals.nit +++ b/lib/signals.nit @@ -244,82 +244,82 @@ redef class Process end # Hang up detected on controlling terminal or death of controlling process -protected fun sighup: Int do return 1 +fun sighup: Int do return 1 # Issued if the user sends an interrupt signal -protected fun sigint: Int do return 2 +fun sigint: Int do return 2 # Issued if the user sends a quit signal -protected fun sigquit: Int do return 3 +fun sigquit: Int do return 3 # Issued if the user attempts to execute an illegal, malformed, unknown, or privileged instruction -protected fun sigill: Int do return 4 +fun sigill: Int do return 4 # Issued when an exception occurs: a condition that a debugger has requested to be informed of -protected fun sigtrap: Int do return 5 +fun sigtrap: Int do return 5 # This signal is sent to a process to tell it to abort, i. e. to terminate -protected fun sigabrt: Int do return 6 +fun sigabrt: Int do return 6 # This signal is sent to a process when it causes a bus error -protected fun sigbus: Int do return 7 +fun sigbus: Int do return 7 # Issued if an illegal mathematical operation is attempted -protected fun sigfpe: Int do return 8 +fun sigfpe: Int do return 8 # If a process gets this signal it must quit immediately and will not perform any clean-up operations -protected fun sigkill: Int do return 9 +fun sigkill: Int do return 9 # Sent to a process to indicate user-defined conditions -protected fun sigusr1: Int do return 10 +fun sigusr1: Int do return 10 # Sent to a process when it makes an invalid virtual memory reference, or segmentation fault -protected fun sigsegv: Int do return 11 +fun sigsegv: Int do return 11 # Sent to a process to indicate user-defined conditions -protected fun sigusr2: Int do return 12 +fun sigusr2: Int do return 12 # Sent to a process when it attempts to write to a pipe without a process connected to the other end -protected fun sigpipe: Int do return 13 +fun sigpipe: Int do return 13 # Alarm Clock signal -protected fun sigalarm: Int do return 14 +fun sigalarm: Int do return 14 # Software termination signal -protected fun sigterm: Int do return 15 +fun sigterm: Int do return 15 # Sent to a process when a child process terminates or is interrupted -protected fun sigchild: Int do return 17 +fun sigchild: Int do return 17 # Tell the operating system to continue (restart) a process previously paused by the SIGSTOP or SIGTSTP signal -protected fun sigcont: Int do return 18 +fun sigcont: Int do return 18 # Tell the operating system to stop a process -protected fun sigstop: Int do return 19 +fun sigstop: Int do return 19 # Sent to a process by its terminal to request it to stop temporarily -protected fun sigtstp: Int do return 20 +fun sigtstp: Int do return 20 # Sent to a process when a socket has urgent or out-of-band data available to read -protected fun sigurg: Int do return 23 +fun sigurg: Int do return 23 # Sent to a process when it has used the CPU for a duration that exceeds a user-settable value -protected fun sigxcpu: Int do return 24 +fun sigxcpu: Int do return 24 # Sent to a process when it grows a file larger than the maximum allowed size -protected fun sigxfsz: Int do return 25 +fun sigxfsz: Int do return 25 # Virtual timer expired -protected fun sigvtalrm: Int do return 26 +fun sigvtalrm: Int do return 26 # Profiling timer expired -protected fun sigprof: Int do return 27 +fun sigprof: Int do return 27 # Sent to a process when its controlling terminal changes its window size -protected fun sigwinch: Int do return 28 +fun sigwinch: Int do return 28 # Sent to a process when the system experiences a power failure -protected fun sigpwr: Int do return 30 +fun sigpwr: Int do return 30 # Sent to a process when it passes a bad argument to a system call -protected fun sigsys: Int do return 31 +fun sigsys: Int do return 31 diff --git a/lib/standard/file.nit b/lib/standard/file.nit index 81341ad..7a68774 100644 --- a/lib/standard/file.nit +++ b/lib/standard/file.nit @@ -1096,30 +1096,30 @@ redef class Sys end # Print `objects` on the standard output (`stdout`). -protected fun printn(objects: Object...) +fun printn(objects: Object...) do sys.stdout.write(objects.to_s) end # Print an `object` on the standard output (`stdout`) and add a newline. -protected fun print(object: Object) +fun print(object: Object) do sys.stdout.write(object.to_s) sys.stdout.write("\n") end # Read a character from the standard input (`stdin`). -protected fun getc: Char +fun getc: Char do return sys.stdin.read_char.ascii end # Read a line from the standard input (`stdin`). -protected fun gets: String +fun gets: String do return sys.stdin.read_line end # Return the working (current) directory -protected fun getcwd: String do return file_getcwd.to_s +fun getcwd: String do return file_getcwd.to_s private fun file_getcwd: NativeString is extern "string_NativeString_NativeString_file_getcwd_0"