Parse and ignore private members

sjrd · Oct 19, 2017 · 95a6d44 · 95a6d44
1 parent 6c47bd3
commit 95a6d44
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/samples/modifiers.ts b/samples/modifiers.ts
@@ -37,6 +37,8 @@ declare module modifiers {
       readonly scheme: string;
       readonly authority: string;
       readonly path: string;
+      private cache;
+      private updateCache();
   }
 
 }
diff --git a/src/main/scala/org/scalajs/tools/tsimporter/Importer.scala b/src/main/scala/org/scalajs/tools/tsimporter/Importer.scala
@@ -188,6 +188,8 @@ class Importer(val output: java.io.PrintWriter) {
         setterSym.resultType = TypeRef.Unit
         setterSym.isBracketAccess = true
 
+      case PrivateMember => // ignore
+
       case _ =>
         owner.members += new CommentSymbol("??? "+member)
     }

diff --git a/src/main/scala/org/scalajs/tools/tsimporter/Trees.scala b/src/main/scala/org/scalajs/tools/tsimporter/Trees.scala
@@ -174,4 +174,6 @@ object Trees {
 
   case class FunctionMember(name: PropertyName, optional: Boolean,
       signature: FunSignature, modifiers: Modifiers) extends MemberTree
+
+  case object PrivateMember extends MemberTree
 }
diff --git a/src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefParser.scala b/src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefParser.scala
@@ -262,7 +262,7 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
     memberBlock ^^ ObjectType
 
   lazy val memberBlock: Parser[List[MemberTree]] =
-    "{" ~> rep(typeMember <~ opt(";" | ",")) <~ "}"
+    "{" ~> rep((typeMember | privateMember) <~ opt(";" | ",")) <~ "}"
 
   lazy val typeMember: Parser[MemberTree] =
     callMember | constructorMember | indexMember | namedMember
@@ -284,6 +284,9 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
       )
     }
 
+  lazy val privateMember =
+    "private" ~> propertyName ~ opt(functionSignature) ^^^ PrivateMember
+
   lazy val modifiers: Parser[Modifiers] =
     rep(modifier).map(_.toSet)