haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gerbview: fix an issue (crash or hang) when a aperture macro definition contains ( and ). 

Note: currently Gerbview does not handle yet operator precedence in aperture macro parameters.
This commit is contained in:
jean-pierre charras 2017-04-09 16:31:14 +02:00
parent 9992a07def
commit f007601507
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gerbview/class_am_param.cpp
View File

@ -5,9 +5,9 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2017 Jean-Pierre Charras <jp.charras at wanadoo.fr>
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -130,6 +130,14 @@ double AM_PARAM::GetValue( const D_CODE* aDcode ) const
paramvalue /= curr_value; paramvalue /= curr_value;
break; break;
case OPEN_PAR:
// Currently: do nothing because operator precedence is not yet considered
break;
case CLOSE_PAR:
// Currently: do nothing because operator precedence is not yet considered
break;
default: default:
wxLogDebug( wxT( "AM_PARAM::GetValue() : unexpected operator\n" ) ); wxLogDebug( wxT( "AM_PARAM::GetValue() : unexpected operator\n" ) );
break; break;
@ -213,6 +221,16 @@ bool AM_PARAM::ReadParam( char*& aText )
aText++; aText++;
break; break;
case '(': // Open a block to evaluate an expression between '(' and ')'
PushOperator( OPEN_PAR );
aText++;
break;
case ')': // close a block between '(' and ')'
PushOperator( CLOSE_PAR );
aText++;
break;
case 'x': case 'x':
case 'X': case 'X':
PushOperator( MUL ); PushOperator( MUL );

20
gerbview/class_am_param.h
View File

@ -5,9 +5,9 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2015 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2017 Jean-Pierre Charras <jp.charras at wanadoo.fr>
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2015 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -110,12 +110,18 @@ From an idea found in Gerbv, here is the way to evaluate a parameter.
a AM_PARAM_ITEM holds info about operands and operators in a parameter definition a AM_PARAM_ITEM holds info about operands and operators in a parameter definition
( a AM_PARAM ) like $2+$2-$3-$3/2 ( a AM_PARAM ) like $2+$2-$3-$3/2
There is no precedence defined in gerber RS274X, so actual value is calculated step to step. Precedence was recently actually defined in gerber RS274X
(Previously, there was no actual info about this precedence)
This is the usual arithmetic precendence between + - x / ( ), the only ones used in Gerber
However, because it is recent, currently, actual value is calculated step to step:
no precedence, and '(' ')' are ignored.
Parameter definition is described by a very primitive assembler. Parameter definition is described by a very primitive assembler.
This "program "should describe how to calculate the parameter. This "program "should describe how to calculate the parameter.
The assembler consist of 8 instruction intended for a stackbased machine. The assembler consist of 10 instruction intended for a stackbased machine.
The instructions are: The instructions are:
NOP, PUSHVALUE, PUSHPARM, ADD, SUB, MUL, DIV, EQUATE NOP, PUSHVALUE, PUSHPARM, ADD, SUB, MUL, DIV, OPEN_PAR, CLOSE_PAR, EQUATE
The instructions The instructions
---------------- ----------------
@ -132,12 +138,14 @@ ADD : The mathematical operation +. Takes the two uppermost values on the
SUB : Same as ADD, but with -. SUB : Same as ADD, but with -.
MUL : Same as ADD, but with *. MUL : Same as ADD, but with *.
DIV : Same as ADD, but with /. DIV : Same as ADD, but with /.
OPEN_PAR : Opening parenthesis: modify the precedence of operators by opening a local block.
CLOSE_PAR : Closing parenthesis: modify the precedence of operators by closing the local block.
POPVALUE : used when evaluate the expression: store current calculated value POPVALUE : used when evaluate the expression: store current calculated value
*/ */
enum parm_item_type enum parm_item_type
{ {
NOP, PUSHVALUE, PUSHPARM, ADD, SUB, MUL, DIV, POPVALUE NOP, PUSHVALUE, PUSHPARM, ADD, SUB, MUL, DIV, OPEN_PAR, CLOSE_PAR, POPVALUE
}; };
/** /**

4
gerbview/class_aperture_macro.cpp
View File

@ -5,9 +5,9 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2016 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2017 Jean-Pierre Charras <jp.charras at wanadoo.fr>
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
gerbview/class_aperture_macro.h
View File

@ -8,7 +8,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2010 Jean-Pierre Charras <jp.charras at wanadoo.fr>
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2010 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see AUTHORS.txt for contributors.
* *