Add support for abstract classes #48
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sjrd
requested changes
Dec 3, 2017
| @@ -297,7 +297,8 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions { | |||
| | "public" ^^^ Modifier.Public | |||
| | "readonly" ^^^ Modifier.ReadOnly | |||
| | "protected" ^^^ Modifier.Protected | |||
| ) | |||
| | lexical.Identifier("abstract") ^^^ Modifier.Abstract | |||
| ) | |||
There was a problem hiding this comment.
The formatting for the ) was broken here (there should be only 2 spaces before it).
| @@ -139,7 +139,8 @@ class Printer(private val output: PrintWriter, outputPackage: String) { | |||
| if (sym.modifiers(Modifier.Const)) "val" | |||
| else if (sym.modifiers(Modifier.ReadOnly)) "def" | |||
| else "var" | |||
| pln" $access$decl $name: ${sym.tpe} = js.native" | |||
| p" $access$decl $name: ${sym.tpe}" | |||
| pln"${if (sym.modifiers(Modifier.Abstract)) "" else " = js.native"}" | |||
There was a problem hiding this comment.
IMO the following would be more readable:
if (!sym.modifiers(Modifier.Abstract))
p" = js.native"
pln""| @@ -158,7 +159,8 @@ class Printer(private val output: PrintWriter, outputPackage: String) { | |||
| p" ${modifiers}def $name" | |||
| if (!sym.tparams.isEmpty) | |||
| p"[${sym.tparams}]" | |||
| pln"($params): ${sym.resultType} = js.native" | |||
| p"($params): ${sym.resultType}" | |||
| pln"${if (sym.modifiers(Modifier.Abstract)) "" else " = js.native"}" | |||
|
This should now be rebased on master, and the |
sbrunk
force-pushed
the
abstract-classes
branch
from
086f99f to
e3b265b
Compare
|
Rebased and nitpicks should have been addressed, too :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Including abstract fields and methods.