Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
9653f4b7
Commit
9653f4b7
authored
Dec 09, 2008
by
Roberto Raggi
Browse files
Fixed macro locations.
parent
a4ed1bc9
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/libs/cplusplus/pp-engine.cpp
View file @
9653f4b7
...
...
@@ -481,12 +481,12 @@ void pp::operator () (const QByteArray &filename,
const
QByteArray
&
source
,
QByteArray
*
result
)
{
const
QByteArray
previousFile
=
env
.
current
_f
ile
;
env
.
current
_f
ile
=
filename
;
const
QByteArray
previousFile
=
env
.
current
F
ile
;
env
.
current
F
ile
=
filename
;
operator
()
(
source
,
result
);
env
.
current
_f
ile
=
previousFile
;
env
.
current
F
ile
=
previousFile
;
}
pp
::
State
pp
::
createStateFromSource
(
const
QByteArray
&
source
)
const
...
...
@@ -518,7 +518,7 @@ void pp::operator()(const QByteArray &source, QByteArray *result)
result
->
append
(
QByteArray
::
number
(
_dot
->
lineno
));
result
->
append
(
' '
);
result
->
append
(
'"'
);
result
->
append
(
env
.
current
_f
ile
);
result
->
append
(
env
.
current
F
ile
);
result
->
append
(
'"'
);
result
->
append
(
'\n'
);
}
else
{
...
...
@@ -844,6 +844,8 @@ void pp::processDefine(TokenIterator firstToken, TokenIterator lastToken)
}
Macro
macro
;
macro
.
fileName
=
env
.
currentFile
;
macro
.
line
=
env
.
currentLine
;
macro
.
name
=
tokenText
(
*
tk
);
++
tk
;
// skip T_IDENTIFIER
...
...
src/libs/cplusplus/pp-environment.cpp
View file @
9653f4b7
...
...
@@ -97,8 +97,6 @@ Macro *Environment::bind(const Macro &__macro)
Macro
*
m
=
new
Macro
(
__macro
);
m
->
hashcode
=
hash_code
(
m
->
name
);
m
->
fileName
=
current_file
;
m
->
line
=
currentLine
;
if
(
++
_macro_count
==
_allocated_macros
)
{
if
(
!
_allocated_macros
)
...
...
@@ -122,11 +120,13 @@ Macro *Environment::bind(const Macro &__macro)
return
m
;
}
Macro
*
Environment
::
remove
(
const
QByteArray
&
name
)
Macro
*
Environment
::
remove
(
const
QByteArray
&
name
)
{
Macro
macro
;
macro
.
name
=
name
;
macro
.
hidden
=
true
;
macro
.
fileName
=
currentFile
;
macro
.
line
=
currentLine
;
return
bind
(
macro
);
}
...
...
src/libs/cplusplus/pp-environment.h
View file @
9653f4b7
...
...
@@ -94,7 +94,7 @@ private:
void
rehash
();
public:
QByteArray
current
_f
ile
;
QByteArray
current
F
ile
;
unsigned
currentLine
;
bool
hide_next
;
...
...
src/libs/cplusplus/pp-macro-expander.cpp
View file @
9653f4b7
...
...
@@ -73,7 +73,7 @@ const char *MacroExpander::operator () (const char *__first, const char *__last,
__result
->
append
(
QByteArray
::
number
(
env
.
currentLine
));
__result
->
append
(
' '
);
__result
->
append
(
'"'
);
__result
->
append
(
env
.
current
_f
ile
);
__result
->
append
(
env
.
current
F
ile
);
__result
->
append
(
'"'
);
__result
->
append
(
'\n'
);
++
lines
;
...
...
@@ -218,7 +218,7 @@ const char *MacroExpander::operator () (const char *__first, const char *__last,
else
if
(
fast_name
==
"__FILE__"
)
{
__result
->
append
(
'"'
);
__result
->
append
(
env
.
current
_f
ile
);
__result
->
append
(
env
.
current
F
ile
);
__result
->
append
(
'"'
);
continue
;
}
...
...
src/plugins/cpptools/cppmodelmanager.cpp
View file @
9653f4b7
...
...
@@ -390,17 +390,17 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type)
}
else
{
Document
::
Ptr
previousDoc
=
switchDocument
(
Document
::
create
(
fileName
));
const
QByteArray
previousFile
=
env
.
current
_f
ile
;
const
QByteArray
previousFile
=
env
.
current
F
ile
;
const
unsigned
previousLine
=
env
.
currentLine
;
env
.
current
_f
ile
=
QByteArray
(
m_currentDoc
->
translationUnit
()
->
fileName
(),
m_currentDoc
->
translationUnit
()
->
fileNameLength
());
env
.
current
F
ile
=
QByteArray
(
m_currentDoc
->
translationUnit
()
->
fileName
(),
m_currentDoc
->
translationUnit
()
->
fileNameLength
());
QByteArray
preprocessedCode
;
m_proc
(
contents
,
&
preprocessedCode
);
//qDebug() << preprocessedCode;
env
.
current
_f
ile
=
previousFile
;
env
.
current
F
ile
=
previousFile
;
env
.
currentLine
=
previousLine
;
m_currentDoc
->
setSource
(
preprocessedCode
);
...
...
Write
Preview
Supports
Markdown
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