e1afb6fdbe
Problem: When enum value contains compound expression with a char
constant, the quotes around char constant is missing in the generated
expression. Example:
enum media_type {
YUY2 = ((('2' << 24) | ('Y' << 16)) | ('U' << 8)) | 'Y'
};
The generated C# enum becomes:
public enum media_type {
YUY2 = (((2 << 24)|(Y << 16))|(U << 8))|Y
}
While the correct representation (after this fix) should be:
public enum media_type {
YUY2 = ((('2' << 24)|('Y' << 16))|('U' << 8))|'Y'
}
Causes: the exprcompound promotes the expression type from char to int
and uses $1.val in the generated expression. However $1.val does not
contain the quotes. Since the type is promoted to int, there's no way to
know there's char component in the compound expression.
Solution: in exprcomound, use $1.rawval if $1.type is T_CHAR or T_WCHAR.
The rawval contains quotes which yield correct expression.
84 lines
3 KiB
C
84 lines
3 KiB
C
/* -----------------------------------------------------------------------------
|
|
* This file is part of SWIG, which is licensed as a whole under version 3
|
|
* (or any later version) of the GNU General Public License. Some additional
|
|
* terms also apply to certain portions of SWIG. The full details of the SWIG
|
|
* license and copyrights can be found in the LICENSE and COPYRIGHT files
|
|
* included with the SWIG source code as distributed by the SWIG developers
|
|
* and at http://www.swig.org/legal.html.
|
|
*
|
|
* cparse.h
|
|
*
|
|
* SWIG parser module.
|
|
* ----------------------------------------------------------------------------- */
|
|
|
|
#ifndef SWIG_CPARSE_H_
|
|
#define SWIG_CPARSE_H_
|
|
|
|
#include "swig.h"
|
|
#include "swigwarn.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* cscanner.c */
|
|
extern String *cparse_file;
|
|
extern int cparse_line;
|
|
extern int cparse_cplusplus;
|
|
extern int cparse_cplusplusout;
|
|
extern int cparse_start_line;
|
|
extern String *cparse_unknown_directive;
|
|
|
|
extern void Swig_cparse_cplusplus(int);
|
|
extern void Swig_cparse_cplusplusout(int);
|
|
extern void scanner_file(File *);
|
|
extern void scanner_next_token(int);
|
|
extern void skip_balanced(int startchar, int endchar);
|
|
extern String *get_raw_text_balanced(int startchar, int endchar);
|
|
extern void skip_decl(void);
|
|
extern void scanner_check_typedef(void);
|
|
extern void scanner_ignore_typedef(void);
|
|
extern void scanner_last_id(int);
|
|
extern void scanner_clear_rename(void);
|
|
extern void scanner_set_location(String *file, int line);
|
|
extern void scanner_set_main_input_file(String *file);
|
|
extern String *scanner_get_main_input_file();
|
|
extern void Swig_cparse_follow_locators(int);
|
|
extern void start_inline(char *, int);
|
|
extern String *scanner_ccode;
|
|
extern int yylex(void);
|
|
|
|
/* parser.y */
|
|
extern SwigType *Swig_cparse_type(String *);
|
|
extern Node *Swig_cparse(File *);
|
|
extern Hash *Swig_cparse_features(void);
|
|
extern void SWIG_cparse_set_compact_default_args(int defargs);
|
|
extern int SWIG_cparse_template_reduce(int treduce);
|
|
|
|
/* util.c */
|
|
extern void Swig_cparse_replace_descriptor(String *s);
|
|
extern SwigType *Swig_cparse_smartptr(Node *n);
|
|
extern void cparse_normalize_void(Node *);
|
|
extern Parm *Swig_cparse_parm(String *s);
|
|
extern ParmList *Swig_cparse_parms(String *s, Node *file_line_node);
|
|
extern Node *new_node(const_String_or_char_ptr tag);
|
|
|
|
/* templ.c */
|
|
extern int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *tscope);
|
|
extern Node *Swig_cparse_template_locate(String *name, ParmList *tparms, Symtab *tscope);
|
|
extern void Swig_cparse_debug_templates(int);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#define SWIG_WARN_NODE_BEGIN(Node) \
|
|
{ \
|
|
String *wrnfilter = Node ? Getattr(Node,"feature:warnfilter") : 0; \
|
|
if (wrnfilter) Swig_warnfilter(wrnfilter,1)
|
|
#define SWIG_WARN_NODE_END(Node) \
|
|
if (wrnfilter) Swig_warnfilter(wrnfilter,0); \
|
|
}
|
|
|
|
#define COMPOUND_EXPR_VAL(dtype) \
|
|
((dtype).type == T_CHAR || (dtype).type == T_WCHAR ? (dtype).rawval : (dtype).val)
|
|
#endif
|