Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
6789e622
Commit
6789e622
authored
Dec 30, 2012
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Pcbnew s-expr file parser bug.
parent
f4af52f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
worksheet.cpp
common/worksheet.cpp
+1
-1
pcb_parser.cpp
pcbnew/pcb_parser.cpp
+4
-4
No files found.
common/worksheet.cpp
View file @
6789e622
...
@@ -1670,7 +1670,7 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont
...
@@ -1670,7 +1670,7 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont
||
!
m_company
.
IsEmpty
()
||
!
m_comment1
.
IsEmpty
()
||
!
m_comment2
.
IsEmpty
()
||
!
m_company
.
IsEmpty
()
||
!
m_comment1
.
IsEmpty
()
||
!
m_comment2
.
IsEmpty
()
||
!
m_comment3
.
IsEmpty
()
||
!
m_comment4
.
IsEmpty
()
)
||
!
m_comment3
.
IsEmpty
()
||
!
m_comment4
.
IsEmpty
()
)
{
{
aFormatter
->
Print
(
aNestLevel
,
"(title_block "
);
aFormatter
->
Print
(
aNestLevel
,
"(title_block
\n
"
);
if
(
!
m_title
.
IsEmpty
()
)
if
(
!
m_title
.
IsEmpty
()
)
aFormatter
->
Print
(
aNestLevel
+
1
,
"(title %s)
\n
"
,
aFormatter
->
Print
(
aNestLevel
+
1
,
"(title %s)
\n
"
,
...
...
pcbnew/pcb_parser.cpp
View file @
6789e622
...
@@ -264,7 +264,7 @@ S3D_MASTER* PCB_PARSER::parse3DModel() throw( PARSE_ERROR )
...
@@ -264,7 +264,7 @@ S3D_MASTER* PCB_PARSER::parse3DModel() throw( PARSE_ERROR )
auto_ptr
<
S3D_MASTER
>
n3D
(
new
S3D_MASTER
(
NULL
)
);
auto_ptr
<
S3D_MASTER
>
n3D
(
new
S3D_MASTER
(
NULL
)
);
NeedSYMBOL
();
NeedSYMBOL
orNUMBER
();
n3D
->
m_Shape3DName
=
FromUTF8
();
n3D
->
m_Shape3DName
=
FromUTF8
();
for
(
token
=
NextTok
();
token
!=
T_RIGHT
;
token
=
NextTok
()
)
for
(
token
=
NextTok
();
token
!=
T_RIGHT
;
token
=
NextTok
()
)
...
@@ -592,12 +592,12 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
...
@@ -592,12 +592,12 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
switch
(
token
)
switch
(
token
)
{
{
case
T_title
:
case
T_title
:
Ne
edSYMBOL
();
Ne
xtTok
();
titleBlock
.
SetTitle
(
FromUTF8
()
);
titleBlock
.
SetTitle
(
FromUTF8
()
);
break
;
break
;
case
T_date
:
case
T_date
:
Ne
edSYMBOL
();
Ne
xtTok
();
titleBlock
.
SetDate
(
FromUTF8
()
);
titleBlock
.
SetDate
(
FromUTF8
()
);
break
;
break
;
...
@@ -1587,7 +1587,7 @@ MODULE* PCB_PARSER::parseMODULE() throw( IO_ERROR, PARSE_ERROR )
...
@@ -1587,7 +1587,7 @@ MODULE* PCB_PARSER::parseMODULE() throw( IO_ERROR, PARSE_ERROR )
break
;
break
;
case
T_path
:
case
T_path
:
NeedSYMBOL
();
NeedSYMBOL
orNUMBER
();
// Paths can be numerical so a number is also a symbol here
module
->
SetPath
(
FromUTF8
()
);
module
->
SetPath
(
FromUTF8
()
);
NeedRIGHT
();
NeedRIGHT
();
break
;
break
;
...
...
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