Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
6c9fc367
Commit
6c9fc367
authored
Jul 28, 2016
by
Alexander von Franqué
Committed by
Alexander von Franqué
Aug 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added --java-class-access-modifier command line option
parent
fd141ea6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
4 deletions
+26
-4
src/source/JavaGenerator.scala
src/source/JavaGenerator.scala
+5
-4
src/source/Main.scala
src/source/Main.scala
+4
-0
src/source/generator.scala
src/source/generator.scala
+17
-0
No files found.
src/source/JavaGenerator.scala
View file @
6c9fc367
...
...
@@ -29,6 +29,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
val
javaAnnotationHeader
=
spec
.
javaAnnotation
.
map
(
pkg
=>
'@'
+
pkg
.
split
(
"\\."
).
last
)
val
javaNullableAnnotation
=
spec
.
javaNullableAnnotation
.
map
(
pkg
=>
'@'
+
pkg
.
split
(
"\\."
).
last
)
val
javaNonnullAnnotation
=
spec
.
javaNonnullAnnotation
.
map
(
pkg
=>
'@'
+
pkg
.
split
(
"\\."
).
last
)
val
javaClassAccessModifierString
=
JavaAccessModifier
.
getCodeGenerationString
(
spec
.
javaClassAccessModifier
)
val
marshal
=
new
JavaMarshal
(
spec
)
class
JavaRefs
()
{
...
...
@@ -109,7 +110,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
writeJavaFile
(
ident
,
origin
,
refs
.
java
,
w
=>
{
writeDoc
(
w
,
doc
)
javaAnnotationHeader
.
foreach
(
w
.
wl
)
w
.
w
(
s
"
public
enum ${marshal.typename(ident, e)}"
).
braced
{
w
.
w
(
s
"
${javaClassAccessModifierString}
enum ${marshal.typename(ident, e)}"
).
braced
{
for
(
o
<-
e
.
options
)
{
writeDoc
(
w
,
o
.
doc
)
w
.
wl
(
idJava
.
enum
(
o
.
ident
)
+
","
)
...
...
@@ -139,7 +140,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
writeDoc
(
w
,
doc
)
javaAnnotationHeader
.
foreach
(
w
.
wl
)
w
.
w
(
s
"
public
abstract class $javaClass$typeParamList"
).
braced
{
w
.
w
(
s
"
${javaClassAccessModifierString}
abstract class $javaClass$typeParamList"
).
braced
{
val
skipFirst
=
SkipFirst
()
generateJavaConstants
(
w
,
i
.
consts
)
...
...
@@ -212,7 +213,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
r
.
fields
.
foreach
(
f
=>
refs
.
find
(
f
.
ty
))
val
javaName
=
if
(
r
.
ext
.
java
)
(
ident
.
name
+
"_base"
)
else
ident
.
name
val
javaFinal
=
if
(!
r
.
ext
.
java
&&
spec
.
javaUseFinalForRecord
)
"
final"
else
""
val
javaFinal
=
if
(!
r
.
ext
.
java
&&
spec
.
javaUseFinalForRecord
)
"final"
else
""
writeJavaFile
(
javaName
,
origin
,
refs
.
java
,
w
=>
{
writeDoc
(
w
,
doc
)
...
...
@@ -225,7 +226,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
}
else
{
""
}
w
.
w
(
s
"
public
$javaFinal class ${self + javaTypeParams(params)}$comparableFlag"
).
braced
{
w
.
w
(
s
"
${javaClassAccessModifierString}
$javaFinal class ${self + javaTypeParams(params)}$comparableFlag"
).
braced
{
w
.
wl
generateJavaConstants
(
w
,
r
.
consts
)
// Field definitions.
...
...
src/source/Main.scala
View file @
6c9fc367
...
...
@@ -38,6 +38,7 @@ object Main {
var
cppUseWideStrings
:
Boolean
=
false
var
javaOutFolder
:
Option
[
File
]
=
None
var
javaPackage
:
Option
[
String
]
=
None
var
javaClassAccessModifier
:
JavaAccessModifier.Value
=
JavaAccessModifier
.
Public
var
javaCppException
:
Option
[
String
]
=
None
var
javaAnnotation
:
Option
[
String
]
=
None
var
javaNullableAnnotation
:
Option
[
String
]
=
None
...
...
@@ -99,6 +100,8 @@ object Main {
.
text
(
"The output for the Java files (Generator disabled if unspecified)."
)
opt
[
String
](
"java-package"
).
valueName
(
"..."
).
foreach
(
x
=>
javaPackage
=
Some
(
x
))
.
text
(
"The package name to use for generated Java classes."
)
opt
[
JavaAccessModifier.Value
](
"java-class-access-modifier"
).
valueName
(
"<public/protected/package>"
).
foreach
(
x
=>
javaClassAccessModifier
=
x
)
.
text
(
"The access modifier to use for generated Java classes (default: public)."
)
opt
[
String
](
"java-cpp-exception"
).
valueName
(
"<exception-class>"
).
foreach
(
x
=>
javaCppException
=
Some
(
x
))
.
text
(
"The type for translated C++ exceptions in Java (default: java.lang.RuntimeException that is not checked)"
)
opt
[
String
](
"java-annotation"
).
valueName
(
"<annotation-class>"
).
foreach
(
x
=>
javaAnnotation
=
Some
(
x
))
...
...
@@ -277,6 +280,7 @@ object Main {
val
outSpec
=
Spec
(
javaOutFolder
,
javaPackage
,
javaClassAccessModifier
,
javaIdentStyle
,
javaCppException
,
javaAnnotation
,
...
...
src/source/generator.scala
View file @
6c9fc367
...
...
@@ -30,6 +30,7 @@ package object generatorTools {
case
class
Spec
(
javaOutFolder
:
Option
[
File
],
javaPackage
:
Option
[
String
],
javaClassAccessModifier
:
JavaAccessModifier.Value
,
javaIdentStyle
:
JavaIdentStyle
,
javaCppException
:
Option
[
String
],
javaAnnotation
:
Option
[
String
],
...
...
@@ -138,6 +139,22 @@ package object generatorTools {
}
}
object
JavaAccessModifier
extends
Enumeration
{
val
Public
=
Value
(
"public"
)
val
Protected
=
Value
(
"protected"
)
val
Package
=
Value
(
"package"
)
def
getCodeGenerationString
(
javaAccessModifier
:
JavaAccessModifier.Value
)
:
String
=
{
javaAccessModifier
match
{
case
Public
=>
"public "
case
Protected
=>
"protected "
case
Package
=>
""
}
}
}
implicit
val
javaAccessModifierReads
:
scopt.Read
[
JavaAccessModifier.Value
]
=
scopt
.
Read
.
reads
(
JavaAccessModifier
withName
_
)
final
case
class
SkipFirst
()
{
private
var
first
=
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment