Browse Source

BEGIN_PUBLISH .. END_PUBLISH applies to methods too

David Rose 18 years ago
parent
commit
8392266935

File diff suppressed because it is too large
+ 351 - 310
dtool/src/cppparser/cppBison.cxx.prebuilt


+ 2 - 2
dtool/src/cppparser/cppBison.h.prebuilt

@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875b.  */
+/* A Bison parser, made by GNU Bison 2.0.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

+ 5 - 1
dtool/src/cppparser/cppBison.yxx

@@ -458,7 +458,11 @@ declaration:
 }
         | KW_PUBLIC ':'
 {
-  current_scope->set_current_vis(V_public);
+  if (publish_nest_level > 0) {
+    current_scope->set_current_vis(V_published);
+  } else {
+    current_scope->set_current_vis(V_public);
+  }
 }
         | KW_PROTECTED ':'
 {

Some files were not shown because too many files changed in this diff