RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

This commit is contained in:
rdb 2016-08-09 01:44:21 +02:00
parent 1d2e17932c 645d179227
commit 29ea65bb3f
5 changed files with 3626 additions and 3763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ReleaseNotes
View File

@ -27,6 +27,8 @@ This issue fixes several bugs that were still found in 1.9.2.
* Support uint8 index buffers in DX9
* Fix occasional frame lag when loading a big model asynchronously
* Fix race condition reading string config var
* Fix interrogate parsing issue with "const static"
* Add back missing libp3pystub.a to Mac OS X SDK
------------------------ RELEASE 1.9.2 ------------------------

7260
dtool/src/cppparser/cppBison.cxx.prebuilt
View File

File diff suppressed because it is too large Load Diff

119
dtool/src/cppparser/cppBison.yxx
View File

@ -783,6 +783,11 @@ storage_class:
empty
{
$$ = 0;
}
| KW_CONST storage_class
{
// This isn't really a storage class, but it helps with parsing.
$$ = $2 | (int)CPPInstance::SC_const;
}
| KW_EXTERN storage_class
{
@ -861,10 +866,22 @@ attribute_specifier:
;
type_like_declaration:
multiple_var_declaration
storage_class var_type_decl
{
/* multiple_var_declaration adds itself to the scope. */
// We don't need to push/pop type, because we can't nest
// type_like_declaration.
if ($2->as_type_declaration()) {
current_type = $2->as_type_declaration()->_type;
} else {
current_type = $2->as_type();
}
push_storage_class($1);
}
multiple_instance_identifiers
{
pop_storage_class();
}
| storage_class type_decl ';'
{
// We don't really care about the storage class here. In fact, it's
@ -891,39 +908,6 @@ type_like_declaration:
}
}
| using_declaration
;
multiple_var_declaration:
storage_class var_type_decl
{
// We don't need to push/pop type, because we can't nest
// multiple_var_declarations.
if ($2->as_type_declaration()) {
current_type = $2->as_type_declaration()->_type;
} else {
current_type = $2->as_type();
}
push_storage_class($1);
}
multiple_instance_identifiers
{
pop_storage_class();
}
| storage_class KW_CONST var_type_decl
{
// We don't need to push/pop type, because we can't nest
// multiple_var_declarations.
if ($3->as_type_declaration()) {
current_type = $3->as_type_declaration()->_type;
} else {
current_type = $3->as_type();
}
push_storage_class($1);
}
multiple_const_instance_identifiers
{
pop_storage_class();
}
/* We don't need to include a rule for variables that point to
functions, because we get those from the function_prototype
@ -933,6 +917,9 @@ multiple_var_declaration:
multiple_instance_identifiers:
instance_identifier_and_maybe_trailing_return_type maybe_initialize_or_function_body
{
if (current_storage_class & CPPInstance::SC_const) {
$1->add_modifier(IIT_const);
}
CPPInstance *inst = new CPPInstance(current_type, $1,
current_storage_class,
@1.file);
@ -941,27 +928,9 @@ multiple_instance_identifiers:
}
| instance_identifier_and_maybe_trailing_return_type maybe_initialize ',' multiple_instance_identifiers
{
CPPInstance *inst = new CPPInstance(current_type, $1,
current_storage_class,
@1.file);
inst->set_initializer($2);
current_scope->add_declaration(inst, global_scope, current_lexer, @1);
}
;
multiple_const_instance_identifiers:
instance_identifier_and_maybe_trailing_return_type maybe_initialize_or_function_body
{
$1->add_modifier(IIT_const);
CPPInstance *inst = new CPPInstance(current_type, $1,
current_storage_class,
@1.file);
inst->set_initializer($2);
current_scope->add_declaration(inst, global_scope, current_lexer, @1);
}
| instance_identifier_and_maybe_trailing_return_type maybe_initialize ',' multiple_const_instance_identifiers
{
$1->add_modifier(IIT_const);
if (current_storage_class & CPPInstance::SC_const) {
$1->add_modifier(IIT_const);
}
CPPInstance *inst = new CPPInstance(current_type, $1,
current_storage_class,
@1.file);
@ -986,21 +955,6 @@ typedef_declaration:
typedef_instance_identifiers
{
pop_storage_class();
}
| storage_class KW_CONST var_type_decl
{
// We don't need to push/pop type, because we can't nest
// multiple_var_declarations.
if ($3->as_type_declaration()) {
current_type = $3->as_type_declaration()->_type;
} else {
current_type = $3->as_type();
}
push_storage_class($1);
}
typedef_const_instance_identifiers
{
pop_storage_class();
}
| storage_class function_prototype maybe_initialize_or_function_body
{
@ -1019,29 +973,18 @@ typedef_declaration:
typedef_instance_identifiers:
instance_identifier_and_maybe_trailing_return_type maybe_initialize_or_function_body
{
if (current_storage_class & CPPInstance::SC_const) {
$1->add_modifier(IIT_const);
}
CPPType *target_type = current_type;
CPPTypedefType *typedef_type = new CPPTypedefType(target_type, $1, current_scope, @1.file);
current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, @1);
}
| instance_identifier_and_maybe_trailing_return_type maybe_initialize ',' typedef_instance_identifiers
{
CPPType *target_type = current_type;
CPPTypedefType *typedef_type = new CPPTypedefType(target_type, $1, current_scope, @1.file);
current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, @1);
}
;
typedef_const_instance_identifiers:
instance_identifier_and_maybe_trailing_return_type maybe_initialize_or_function_body
{
$1->add_modifier(IIT_const);
CPPType *target_type = current_type;
CPPTypedefType *typedef_type = new CPPTypedefType(target_type, $1, current_scope, @1.file);
current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, @1);
}
| instance_identifier_and_maybe_trailing_return_type maybe_initialize ',' typedef_const_instance_identifiers
{
$1->add_modifier(IIT_const);
if (current_storage_class & CPPInstance::SC_const) {
$1->add_modifier(IIT_const);
}
CPPType *target_type = current_type;
CPPTypedefType *typedef_type = new CPPTypedefType(target_type, $1, current_scope, @1.file);
current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, @1);

4
dtool/src/cppparser/cppInstance.h
View File

@ -64,6 +64,10 @@ public:
SC_deleted = 0x8000,
SC_thread_local = 0x10000,
// This isn't really a storage class. It's only used temporarily by the
// parser, to make parsing specifier sequences a bit easier.
SC_const = 0x20000,
};
CPPInstance(CPPType *type, const string &name, int storage_class = 0);

4
makepanda/makepanda.py
View File

@ -6950,8 +6950,10 @@ def MakeInstallerOSX():
oscmd("cp -R %s/lib/libp3fmod_audio.* dstroot/fmodex/Developer/Panda3D/lib/" % GetOutputDir())
oscmd("cp -R %s/lib/libfmodex* dstroot/fmodex/Developer/Panda3D/lib/" % GetOutputDir())
oscmd("mkdir -p dstroot/headers/Developer/Panda3D")
oscmd("mkdir -p dstroot/headers/Developer/Panda3D/lib")
oscmd("cp -R %s/include dstroot/headers/Developer/Panda3D/include" % GetOutputDir())
if os.path.isfile(GetOutputDir() + "/lib/libp3pystub.a"):
oscmd("cp -R -P %s/lib/libp3pystub.a dstroot/headers/Developer/Panda3D/lib/" % GetOutputDir())
if os.path.isdir("samples"):
oscmd("mkdir -p dstroot/samples/Developer/Examples/Panda3D")