From 2ed5093f757c49d87097de5ff3477de0f2530031 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Fri, 16 Oct 2015 13:57:15 -0400 Subject: [PATCH] lib: move pseudo-toplevel methods from Object Signed-off-by: Jean Privat --- lib/bcm2835/bcm2835.nit | 8 +++----- lib/core/time.nit | 6 ++---- lib/signals.nit | 41 +++++++++++++++++++---------------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/lib/bcm2835/bcm2835.nit b/lib/bcm2835/bcm2835.nit index 48f0ed2..d77d134 100644 --- a/lib/bcm2835/bcm2835.nit +++ b/lib/bcm2835/bcm2835.nit @@ -25,11 +25,9 @@ in "C Header" `{ #include `} -redef class Object - protected fun bcm2835_init: Bool `{ return bcm2835_init(); `} - protected fun bcm2835_close `{ bcm2835_close(); `} - protected fun bcm2835_debug=(v: Bool) `{ bcm2835_set_debug(v); `} -end +fun bcm2835_init: Bool `{ return bcm2835_init(); `} +fun bcm2835_close `{ bcm2835_close(); `} +fun bcm2835_debug=(v: Bool) `{ bcm2835_set_debug(v); `} # A physical binary pin interface Pin diff --git a/lib/core/time.nit b/lib/core/time.nit index adac6ff..6c99016 100644 --- a/lib/core/time.nit +++ b/lib/core/time.nit @@ -21,10 +21,8 @@ in "C Header" `{ #include `} -redef class Object - # Unix time: the number of seconds elapsed since January 1, 1970 - protected fun get_time: Int `{ return time(NULL); `} -end +# Unix time: the number of seconds elapsed since January 1, 1970 +fun get_time: Int `{ return time(NULL); `} redef class Sys # Wait a specific number of second and nanoseconds diff --git a/lib/signals.nit b/lib/signals.nit index 440fd39..002ff89 100644 --- a/lib/signals.nit +++ b/lib/signals.nit @@ -203,30 +203,27 @@ interface SignalHandler `} end -redef interface Object - - # Check signals for safe operation - # will callback receiver of raised signals - # can callback any instance of SignalHandler, not just this one - protected fun check_signals: Bool is extern import SignalHandler.receive_signal `{ - int sig; - int raised_something = 0; - - for (sig = 0; sig < 32; sig ++) - if (nit_signals_list[sig].raised) { - nit_signals_list[sig].raised = 0; - raised_something = 1; - SignalHandler handler = (SignalHandler)nit_signals_list[sig].handler; - SignalHandler_receive_signal(handler, sig); - } +# Check signals for safe operation +# will callback receiver of raised signals +# can callback any instance of SignalHandler, not just this one +fun check_signals: Bool is extern import SignalHandler.receive_signal `{ + int sig; + int raised_something = 0; + + for (sig = 0; sig < 32; sig ++) + if (nit_signals_list[sig].raised) { + nit_signals_list[sig].raised = 0; + raised_something = 1; + SignalHandler handler = (SignalHandler)nit_signals_list[sig].handler; + SignalHandler_receive_signal(handler, sig); + } - return raised_something; - `} + return raised_something; +`} - # Set alarm signal - # can callback any instance of SignalHandler, not just this one - protected fun set_alarm(sec: Int) `{ alarm(sec); `} -end +# Set alarm signal +# can callback any instance of SignalHandler, not just this one +fun set_alarm(sec: Int) `{ alarm(sec); `} redef class Process # Send a signal to the process -- 1.7.9.5