Skip to content

Commit b1b04ab

Browse files
committed
Parse and ignore private members
1 parent 6c47bd3 commit b1b04ab

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

samples/modifiers.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ declare module modifiers {
3737
readonly scheme: string;
3838
readonly authority: string;
3939
readonly path: string;
40+
private cache;
41+
private updateCache();
42+
private static resolve(): String;
4043
}
4144

4245
}

src/main/scala/org/scalajs/tools/tsimporter/Importer.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ class Importer(val output: java.io.PrintWriter) {
188188
setterSym.resultType = TypeRef.Unit
189189
setterSym.isBracketAccess = true
190190

191+
case PrivateMember => // ignore
192+
191193
case _ =>
192194
owner.members += new CommentSymbol("??? "+member)
193195
}

src/main/scala/org/scalajs/tools/tsimporter/Trees.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,6 @@ object Trees {
174174

175175
case class FunctionMember(name: PropertyName, optional: Boolean,
176176
signature: FunSignature, modifiers: Modifiers) extends MemberTree
177+
178+
case object PrivateMember extends MemberTree
177179
}

src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefParser.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
265265
"{" ~> rep(typeMember <~ opt(";" | ",")) <~ "}"
266266

267267
lazy val typeMember: Parser[MemberTree] =
268-
callMember | constructorMember | indexMember | namedMember
268+
callMember | constructorMember | indexMember | namedMember | privateMember
269269

270270
lazy val callMember: Parser[MemberTree] =
271271
functionSignature ^^ CallMember
@@ -284,6 +284,9 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
284284
)
285285
}
286286

287+
lazy val privateMember =
288+
"private" ~> opt("static") ~> propertyName ~ opt(functionSignature) ^^^ PrivateMember
289+
287290
lazy val modifiers: Parser[Modifiers] =
288291
rep(modifier).map(_.toSet)
289292

0 commit comments

Comments
 (0)