Solves #38: handle defs without parens in ControllerS

jokade · Apr 4, 2015 · a2d1dc5 · a2d1dc5
1 parent 3c90bf8
commit a2d1dc5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/main/scala/biz/enef/angulate/impl/ControllerMacros.scala b/src/main/scala/biz/enef/angulate/impl/ControllerMacros.scala
@@ -149,7 +149,10 @@ protected[angulate] trait ControllerMacroUtils {
       (funcs map { func =>
         val funcName = func.name.toString
         val (params,args) = makeArgsList(func)
-        q"""global.Object.defineProperty(scope,$funcName,literal(value = (..$params) => ctrl.$func(..$args)))"""
+        if(func.paramLists.isEmpty)
+          q"""global.Object.defineProperty(scope,$funcName,literal(get = () => ctrl.$func))"""
+        else
+          q"""global.Object.defineProperty(scope,$funcName,literal(value = (..$params) => ctrl.$func(..$args)))"""
       })
   }
 

diff --git a/src/main/scala/biz/enef/angulate/impl/DirectiveMacros.scala b/src/main/scala/biz/enef/angulate/impl/DirectiveMacros.scala
@@ -62,7 +62,7 @@ protected[angulate] class DirectiveMacros(val c: blackbox.Context) extends Macro
             ddo
           }):js.Function)
        """
-    println(carray)
+    //println(carray)
 
     val tree = q"""{import scala.scalajs.js
                     import js.Dynamic.{global,literal}

diff --git a/src/main/scala/biz/enef/angulate/impl/MacroBase.scala b/src/main/scala/biz/enef/angulate/impl/MacroBase.scala
@@ -31,19 +31,20 @@ protected[angulate] abstract class MacroBase {
         |${showCode(tree)}
       """.stripMargin, true )
 
-
-  protected[this] def makeArgsList(f: MethodSymbol) = {
-    f.paramLists.head.map( p => {
-      val name = TermName(c.freshName("x"))
-      (q"$name: ${p.typeSignature}", q"$name")
-    }).unzip
-  }
+  protected[this] def makeArgsList(f: MethodSymbol) =
+    if(f.paramLists.isEmpty)
+      (List(),List())
+    else
+      f.paramLists.head.map( p => {
+        val name = TermName(c.freshName("x"))
+        (q"$name: ${p.typeSignature}", q"$name")
+      }).unzip
 
   protected[this] def getDINames(f: MethodSymbol) = {
     f.paramLists.head.map{ p=>
       p.annotations.find( _.tree.tpe =:= namedAnnotation ).map { a =>
         val name = a.tree.children.tail.head.toString
-        // TODO: that's ludicrous... what is thr right way to unquote the string???
+        // TODO: that's ludicrous... what is the right way to unquote the string???
         name.substring(1,name.length-1)
       }.getOrElse(p.name.toString)
     }