Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
e24411c5
Commit
e24411c5
authored
Apr 12, 2010
by
Sebastian Eichelbaum
Browse files
[STYLE]
parent
88b4c99b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
src/common/WProjectFile.cpp
src/common/WProjectFile.cpp
+3
-2
src/kernel/combiner/WModuleProjectFileCombiner.cpp
src/kernel/combiner/WModuleProjectFileCombiner.cpp
+4
-4
No files found.
src/common/WProjectFile.cpp
View file @
e24411c5
...
...
@@ -23,7 +23,8 @@
//---------------------------------------------------------------------------
#include <fstream>
#include <utility>
#include <string>
#include <vector>
#include <boost/regex.hpp>
...
...
@@ -119,7 +120,7 @@ void WProjectFile::threadMain()
(
*
iter
)
->
done
();
}
}
catch
(
const
std
::
exception
&
e
)
catch
(
const
std
::
exception
&
e
)
{
// remove from thread list
WKernel
::
getRunningKernel
()
->
getRootContainer
()
->
finishedPendingThread
(
shared_from_this
()
);
...
...
src/kernel/combiner/WModuleProjectFileCombiner.cpp
View file @
e24411c5
...
...
@@ -133,8 +133,8 @@ bool WModuleProjectFileCombiner::parse( std::string line, unsigned int lineNumbe
// matches[1] and [2] are the module ID and connector name of the output connector
// matches[3] and [4] are the module ID and connector name of the target input connector
wlog
::
debug
(
"Project Loader [Parser]"
)
<<
"Line "
<<
lineNumber
<<
": Connection between
\"
"
<<
matches
[
2
]
<<
"
\"
of module "
<<
matches
[
1
]
<<
" and
\"
"
<<
matches
[
4
]
<<
"
\"
of module "
<<
matches
[
3
]
<<
"."
;
wlog
::
debug
(
"Project Loader [Parser]"
)
<<
"Line "
<<
lineNumber
<<
": Connection between
\"
"
<<
matches
[
2
]
<<
"
\"
of module "
<<
matches
[
1
]
<<
" and
\"
"
<<
matches
[
4
]
<<
"
\"
of module "
<<
matches
[
3
]
<<
"."
;
// now we search in modules[ matches[1] ] for an output connector named matches[2]
m_connections
.
push_back
(
Connection
(
Connector
(
boost
::
lexical_cast
<
unsigned
int
>
(
matches
[
1
]
),
matches
[
2
]
),
...
...
@@ -147,8 +147,8 @@ bool WModuleProjectFileCombiner::parse( std::string line, unsigned int lineNumbe
// matches[2] is the property name
// matches[3] is the property value
wlog
::
debug
(
"Project Loader [Parser]"
)
<<
"Line "
<<
lineNumber
<<
": Property
\"
"
<<
matches
[
2
]
<<
"
\"
of module "
<<
matches
[
1
]
<<
" set to "
<<
matches
[
3
];
wlog
::
debug
(
"Project Loader [Parser]"
)
<<
"Line "
<<
lineNumber
<<
": Property
\"
"
<<
matches
[
2
]
<<
"
\"
of module "
<<
matches
[
1
]
<<
" set to "
<<
matches
[
3
];
m_properties
.
push_back
(
PropertyValue
(
Property
(
boost
::
lexical_cast
<
unsigned
int
>
(
matches
[
1
]
),
matches
[
2
]
),
matches
[
3
]
)
);
}
...
...
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