Use osx as the short tag for OS X instead of mac.

[cycript.git] / Replace.hpp

diff --git a/Replace.hpp b/Replace.hpp
index a0329025346fa3418f6b55643793d34e3dbbca33..381f2a82f2dd409f3e5b50e781f53a7fedfa064d 100644 (file)
--- a/Replace.hpp
+++ b/Replace.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
@@ -52,17 +52,17 @@
     CYStatements()
 
 #define $P1(arg0, args...) \
-    $P($I(arg0), ##args)
+    $P(arg0, ##args)
 #define $P2(arg0, arg1, args...) \
-    $P($I(arg0), $P1(arg1, ##args))
+    $P(arg0, $P1(arg1, ##args))
 #define $P3(arg0, arg1, arg2, args...) \
-    $P($I(arg0), $P2(arg1, arg2, ##args))
+    $P(arg0, $P2(arg1, arg2, ##args))
 #define $P4(arg0, arg1, arg2, arg3, args...) \
-    $P($I(arg0), $P3(arg1, arg2, arg3, ##args))
+    $P(arg0, $P3(arg1, arg2, arg3, ##args))
 #define $P5(arg0, arg1, arg2, arg3, arg4, args...) \
-    $P($I(arg0), $P4(arg1, arg2, arg3, arg4, ##args))
+    $P(arg0, $P4(arg1, arg2, arg3, arg4, ##args))
 #define $P6(arg0, arg1, arg2, arg3, arg4, arg5, args...) \
-    $P($I(arg0), $P5(arg1, arg2, arg3, arg4, arg5, ##args))
+    $P(arg0, $P5(arg1, arg2, arg3, arg4, arg5, ##args))
 
 #define $C(args...) \
     ($ CYCall(args))
@@ -110,8 +110,8 @@
 #define $N5(func, args...) \
     $N(func, $C5_(args))
 
-#define $L(args...) \
-    $ CYDeclaration(args)
+#define $L(arg0, args...) \
+    $ CYDeclaration($I(arg0), ##args)
 #define $L1(arg0) \
     $ CYDeclarations(arg0)
 #define $L2(arg0, args...) \