Support any number of arguments to console methods (fixes #5495).

servo · Apr 4, 2015 · c8c7962 · c8c7962 · Ms2ger · Apr 4, 2015
1 parent 4ffeb81
commit c8c7962
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
@@ -31,26 +31,36 @@ impl Console {
 }
 
 impl<'a> ConsoleMethods for JSRef<'a, Console> {
-    fn Log(self, message: DOMString) {
-        println!("{}", message);
-        //TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later
-        propagate_console_msg(&self, ConsoleMessage::LogMessage(message, String::from_str("test"), 1, 1));
+    fn Log(self, messages: Vec<DOMString>) {
+        for message in messages {
+            println!("{}", message);
+            //TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later
+            propagate_console_msg(&self, ConsoleMessage::LogMessage(message, String::from_str("test"), 1, 1));
+        }
     }
 
-    fn Debug(self, message: DOMString) {
-        println!("{}", message);
+    fn Debug(self, messages: Vec<DOMString>) {
+        for message in messages {
+            println!("{}", message);
+        }
     }
 
-    fn Info(self, message: DOMString) {
-        println!("{}", message);
+    fn Info(self, messages: Vec<DOMString>) {
+        for message in messages {
+            println!("{}", message);
+        }
     }
 
-    fn Warn(self, message: DOMString) {
-        println!("{}", message);
+    fn Warn(self, messages: Vec<DOMString>) {
+        for message in messages {
+            println!("{}", message);
+        }
     }
 
-    fn Error(self, message: DOMString) {
-        println!("{}", message);
+    fn Error(self, messages: Vec<DOMString>) {
+        for message in messages {
+            println!("{}", message);
+        }
     }
 
     fn Assert(self, condition: bool, message: Option<DOMString>) {

diff --git a/components/script/dom/webidls/Console.webidl b/components/script/dom/webidls/Console.webidl
@@ -12,10 +12,10 @@
 
 interface Console {
   // These should be DOMString message, DOMString message2, ...
-  void log(DOMString message);
-  void debug(DOMString message);
-  void info(DOMString message);
-  void warn(DOMString message);
-  void error(DOMString message);
+  void log(DOMString... messages);
+  void debug(DOMString... messages);
+  void info(DOMString... messages);
+  void warn(DOMString... messages);
+  void error(DOMString... messages);
   void assert(boolean condition, optional DOMString message);
 };