Changeset 16071 for trunk/FACT++

Timestamp:

05/23/13 11:08:38 (11 years ago)

Author:

tbretz

Message:

Added console.warn to print a highlighted message to the ocnsole.

Location:

trunk/FACT++

Files:

• scripts/doc/console.js (modified) (1 diff)
• src/InterpreterV8.cc (modified) (2 diffs)
• src/InterpreterV8.h (modified) (3 diffs)
• src/RemoteControl.h (modified) (1 diff)

trunk/FACT++/scripts/doc/console.js

@@ -31 +31 @@
  */
 console.out = function() { /* [native code] */ }
+
+/**
+ *
+ * Displays a warning message on the local console (only).
+ *
+ * (This is mainly meant for debugging purpose to highlight warning
+ *  messages.)
+ *
+ * @param argument
+ *     Any kind of argument can be given. If it is not a String, it
+ *     is converted using the toString() member function.
+ *
+ * @param [. . .]
+ *     Any number of additional arguments. Each argument will appear in
+ *     a new line.
+ *
+ * @example
+ *     console.warn("WARNING: Five="+5, "--- new line ---");
+ *
+ */
+console.warn = function() { /* [native code] */ }

trunk/FACT++/src/InterpreterV8.cc

@@ -677 +677 @@
         if (*str)
             JsOut(*str);
+    }
+    return Undefined();
+}
+
+Handle<Value> InterpreterV8::FuncWarn(const Arguments& args)
+{
+    for (int i=0; i<args.Length(); i++)
+    {
+        const String::AsciiValue str(args[i]);
+        if (*str)
+            JsWarn(*str);
     }
     return Undefined();
@@ -2420 +2431 @@
     Handle<ObjectTemplate> console = ObjectTemplate::New();
     console->Set(String::New("out"), FunctionTemplate::New(WrapOut), ReadOnly);
+    console->Set(String::New("warn"), FunctionTemplate::New(WrapWarn), ReadOnly);
 
     Handle<ObjectTemplate> onchange = ObjectTemplate::New();

trunk/FACT++/src/InterpreterV8.h

@@ -78 +78 @@
     v8::Handle<v8::Value> FuncAlarm(const v8::Arguments& args);
     v8::Handle<v8::Value> FuncOut(const v8::Arguments& args);
+    v8::Handle<v8::Value> FuncWarn(const v8::Arguments& args);
     v8::Handle<v8::Value> FuncFile(const v8::Arguments& args);
     v8::Handle<v8::Value> FuncSendMail(const v8::Arguments& args);
@@ -132 +133 @@
     static v8::Handle<v8::Value> WrapAlarm(const v8::Arguments &args)    { if (This) return This->FuncAlarm(args);    else return v8::Undefined(); }
     static v8::Handle<v8::Value> WrapOut(const v8::Arguments &args)      { if (This) return This->FuncOut(args);      else return v8::Undefined(); }
+    static v8::Handle<v8::Value> WrapWarn(const v8::Arguments &args)     { if (This) return This->FuncWarn(args);     else return v8::Undefined(); }
     static v8::Handle<v8::Value> WrapWait(const v8::Arguments &args)     { if (This) return This->FuncWait(args);     else return v8::Undefined(); }
     static v8::Handle<v8::Value> WrapSend(const v8::Arguments &args)     { if (This) return This->FuncSend(args);     else return v8::Undefined(); }
@@ -187 +189 @@
     virtual void  JsAlarm(const std::string & = "") { }
     virtual void  JsOut(const std::string &) { }
+    virtual void  JsWarn(const std::string &) { }
     virtual void  JsResult(const std::string &) { }
     virtual void  JsException(const std::string &) { }

trunk/FACT++/src/RemoteControl.h

@@ -166 +166 @@
     void  JsEnd(const std::string &)          { UnsubscribeAll(); InterpreterV8::JsEnd(); SetSection(-4); }
     bool  JsSend(const std::string &str)      { return ProcessCommand(str, false); }
-    void  JsOut(const std::string &msg)       { lin << msg << endl; }
+    void  JsOut(const std::string &msg)       { lin << kDefault << msg << endl; }
+    void  JsWarn(const std::string &msg)      { lin << kYellow << msg << endl; }
     void  JsResult(const std::string &msg)    { if (msg!="use strict") lin << kBlue << " = " << msg << '\n' << endl; }
     void  JsPrint(const std::string &msg)     { if (fImp) fImp->Comment(msg); }