Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse and ignore private members #49

Merged
merged 1 commit into from
Oct 19, 2017
Merged

Parse and ignore private members #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions samples/modifiers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ declare module modifiers {
readonly scheme: string;
readonly authority: string;
readonly path: string;
private cache;
private updateCache();
private static resolve(): String;
}

}
2 changes: 2 additions & 0 deletions src/main/scala/org/scalajs/tools/tsimporter/Importer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/scala/org/scalajs/tools/tsimporter/Trees.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,6 @@ object Trees {

case class FunctionMember(name: PropertyName, optional: Boolean,
signature: FunSignature, modifiers: Modifiers) extends MemberTree

case object PrivateMember extends MemberTree
}
5 changes: 4 additions & 1 deletion src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
"{" ~> rep(typeMember <~ opt(";" | ",")) <~ "}"

lazy val typeMember: Parser[MemberTree] =
callMember | constructorMember | indexMember | namedMember
callMember | constructorMember | indexMember | namedMember | privateMember

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

lazy val privateMember =
"private" ~> opt("static") ~> propertyName ~ opt(functionSignature) ^^^ PrivateMember

lazy val modifiers: Parser[Modifiers] =
rep(modifier).map(_.toSet)

Expand Down