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
1ee7a554
Commit
1ee7a554
authored
Jul 13, 2016
by
Kenny Kaye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve import and extern based on include provided include path
parent
64a9d3aa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
19 deletions
+38
-19
src/source/Main.scala
src/source/Main.scala
+3
-3
src/source/parser.scala
src/source/parser.scala
+32
-13
test-suite/djinni/all.djinni
test-suite/djinni/all.djinni
+1
-1
test-suite/djinni/vendor/third-party/duration.djinni
test-suite/djinni/vendor/third-party/duration.djinni
+0
-0
test-suite/djinni/vendor/third-party/duration.yaml
test-suite/djinni/vendor/third-party/duration.yaml
+0
-0
test-suite/generated-src/inFileList.txt
test-suite/generated-src/inFileList.txt
+2
-2
No files found.
src/source/Main.scala
View file @
1ee7a554
...
...
@@ -16,7 +16,7 @@
package
djinni
import
java.io.
{
IOException
,
FileInputStream
,
InputStreamReader
,
File
,
BufferedWriter
,
FileWriter
}
import
java.io.
{
IOException
,
File
NotFoundException
,
File
InputStream
,
InputStreamReader
,
File
,
BufferedWriter
,
FileWriter
}
import
djinni.generatorTools._
...
...
@@ -244,10 +244,10 @@ object Main {
None
}
val
idl
=
try
{
(
new
Parser
).
parseFile
(
idlFile
,
inFileListWriter
)
(
new
Parser
(
idlIncludePaths
)
).
parseFile
(
idlFile
,
inFileListWriter
)
}
catch
{
case
ex
:
IOException
=>
case
ex
@
(
_:
FileNotFoundException
|
_
:
IOException
)
=>
System
.
err
.
println
(
"Error reading from --idl file: "
+
ex
.
getMessage
)
System
.
exit
(
1
);
return
}
...
...
src/source/parser.scala
View file @
1ee7a554
...
...
@@ -16,7 +16,7 @@
package
djinni
import
java.io.
{
File
,
InputStreamReader
,
FileInputStream
,
Writer
}
import
java.io.
{
File
,
FileNotFoundException
,
InputStreamReader
,
FileInputStream
,
Writer
}
import
djinni.ast.Interface.Method
import
djinni.ast.Record.DerivingType.DerivingType
...
...
@@ -29,7 +29,7 @@ import scala.collection.mutable
import
scala.util.parsing.combinator.RegexParsers
import
scala.util.parsing.input.
{
Position
,
Positional
}
case
class
Parser
()
{
case
class
Parser
(
includePaths
:
List
[
String
]
)
{
val
visitedFiles
=
mutable
.
Set
[
File
]()
val
fileStack
=
mutable
.
Stack
[
File
]()
...
...
@@ -37,23 +37,42 @@ val fileStack = mutable.Stack[File]()
private
object
IdlParser
extends
RegexParsers
{
override
protected
val
whiteSpace
=
"""[ \t\n\r]+"""
.
r
def
idlFile
(
origin
:
String
)
:
Parser
[
IdlFile
]
=
rep
(
importFile
)
~
rep
(
typeDecl
(
origin
))
^^
{
case
imp
~
types
=>
IdlFile
(
imp
,
types
)
}
def
importFile
:
Parser
[
FileRef
]
=
{
def
fileParent
:
String
=
if
(
fileStack
.
top
.
getParent
()
!=
null
)
return
fileStack
.
top
.
getParent
()
+
"/"
else
return
""
def
idlFile
(
origin
:
String
)
:
Parser
[
IdlFile
]
=
rep
(
importFileRef
)
~
rep
(
typeDecl
(
origin
))
^^
{
case
imp
~
types
=>
IdlFile
(
imp
,
types
)
}
def
importFileRef
()
:
Parser
[
FileRef
]
=
{
(
"@"
~>
directive
)
~
(
"\""
~>
filePath
<~
"\""
)
^^
{
case
"import"
~
x
=>
val
newPath
=
fileParent
+
x
new
IdlFileRef
(
new
File
(
newPath
))
case
"extern"
~
x
=>
val
newPath
=
fileParent
+
x
new
ExternFileRef
(
new
File
(
newPath
))
case
"import"
~
x
=>
{
new
IdlFileRef
(
importFile
(
x
))
}
case
"extern"
~
x
=>
{
new
ExternFileRef
(
importFile
(
x
))
}
}
}
def
importFile
(
fileName
:
String
)
:
File
=
{
var
file
:
Option
[
File
]
=
None
includePaths
.
foreach
(
path
=>
{
if
(
file
.
isEmpty
)
{
var
relPath
=
if
(
path
==
"."
)
fileParent
else
path
+
"/"
val
tmp
=
new
File
(
relPath
+
fileName
);
if
(
tmp
.
exists
)
file
=
Some
(
tmp
)
}
})
if
(
file
.
isEmpty
)
throw
new
FileNotFoundException
(
"Unable to find file \""
+
fileName
+
"\" at "
+
fileStack
.
top
.
getCanonicalPath
)
return
file
.
get
}
def
filePath
=
"[^\"]*"
.
r
def
fileParent
()
:
String
=
{
if
(
fileStack
.
top
.
getParent
()
!=
null
)
fileStack
.
top
.
getParent
()
+
"/"
else
""
}
def
directive
=
importDirective
|
externDirective
def
importDirective
=
"import"
.
r
def
externDirective
=
"extern"
.
r
...
...
test-suite/djinni/all.djinni
View file @
1ee7a554
@import "common.djinni"
@import "date.djinni"
@import "duration.djinni"
@import "
third-party/
duration.djinni"
test-suite/djinni/duration.djinni
→
test-suite/djinni/
vendor/third-party/
duration.djinni
View file @
1ee7a554
File moved
test-suite/djinni/duration.yaml
→
test-suite/djinni/
vendor/third-party/
duration.yaml
View file @
1ee7a554
File moved
test-suite/generated-src/inFileList.txt
View file @
1ee7a554
...
...
@@ -17,5 +17,5 @@ djinni/single_language_interfaces.djinni
djinni/extended_record.djinni
djinni/date.djinni
djinni/date.yaml
djinni
/duration.djinni
djinni
/duration.yaml
./djinni/vendor/third-party
/duration.djinni
./djinni/vendor/third-party
/duration.yaml
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