Commit graph

5,438 commits

Author SHA1 Message Date
Marko Klopcic
2df4449e3b commands \f? (LateX formulas) are no longer ignored - formulas are copied literally to Java comments 2013-01-28 20:07:36 +01:00
William S Fulton
32f8248e24 Fix shift/shift and shift/reduce errors around variadic templates since merge 2013-01-28 07:06:37 +00:00
William S Fulton
e805d5f925 Merge branch 'master' into gsoc2009-matevz
parser.y still to be fixed up

Conflicts:
	Doc/Devel/engineering.html
	Examples/Makefile.in
	Lib/allegrocl/allegrocl.swg
	Lib/csharp/csharp.swg
	Lib/csharp/enums.swg
	Lib/csharp/enumsimple.swg
	Lib/csharp/enumtypesafe.swg
	Lib/java/java.swg
	Lib/python/pydocs.swg
	Lib/r/rtype.swg
	Source/Include/swigwarn.h
	Source/Modules/octave.cxx
	Source/Modules/python.cxx
	Source/Modules/ruby.cxx
	Source/Swig/scanner.c
	Source/Swig/stype.c
	Source/Swig/swig.h
	configure.ac
2013-01-28 07:01:37 +00:00
Marko Klopcic
9a1bb671c1 fixed bug with caption in command 'image' 2013-01-27 22:18:06 +01:00
Marko Klopcic
d52de0f36f fixed comments for enum types in Java - they were missing before 2013-01-26 22:52:34 +01:00
William S Fulton
07c35d61e3 Fix generated code for rvalue references by converting functions returning an rvalue reference into something that can be taken the address of - via a const ref cast. Now the rvalue_reference tests compile under g++-4.7 (C# only atm) 2013-01-24 08:02:34 +00:00
Marko Klopcic
8de06366cf fixed handling of quoted text adn standalone backslash and @ 2013-01-23 23:15:36 +01:00
Marko Klopcic
43eeb4528c warnings eliminated, examples fixed, only doxygen_misc_constructs is not working now 2013-01-22 23:21:02 +01:00
Marko Klopcic
f6fc808534 fixed handling of < and > when they are not used for html tag 2013-01-21 22:22:02 +01:00
William S Fulton
d357bec829 Remove recently added %expect in parser in case of backward compatibility problems 2013-01-21 20:04:06 +00:00
William S Fulton
4b869de2e8 Cosmetic changes to previous (unicode literals) commit 2013-01-21 19:43:14 +00:00
William S Fulton
144e2ab7b4 Fixes to previous (unicode literals) commit 2013-01-21 19:42:44 +00:00
Vladimir Kalinin
7d800a655d Unicode literals 2013-01-21 19:09:56 +00:00
Brant K. Kyser
3654031d4f Repair typo from previous commit. 2013-01-19 01:27:34 +00:00
William S Fulton
bd3e93ae61 Tidy up last few commits for Java new jniclasspackage pragma 2013-01-19 00:58:56 +00:00
William S Fulton
36ce54da8d Whitespace fixup 2013-01-19 00:34:05 +00:00
Marko Klopcic
a2b0d42c32 fixed tests for HTML entities and handling of HTML entities 2013-01-18 22:30:23 +01:00
Marko Klopcic
4955cdaac6 added handling of HTML entities 2013-01-18 22:22:22 +01:00
Marko Klopcic
13d2dad679 added tests for HTML tags, bugs in HTML tags fixed 2013-01-18 21:21:12 +01:00
Marko Klopcic
f25d03612b added the missing doxy command 'example' 2013-01-17 23:17:06 +01:00
Brant K. Kyser
9318ece01f Use NSPACE_SEPARATOR rather than literal. 2013-01-17 08:13:05 +00:00
Brant K. Kyser
f7e27ec7a9 Fix issue with using directors with the nspace feature without the -package commandline argument. 2013-01-17 08:13:05 +00:00
Brant K. Kyser
ace33bbf41 Fix issue with using directors with the nspace feature without the -package commandline argument. 2013-01-17 08:13:04 +00:00
Brant K. Kyser
7104b20d0d imclass_class_package variable names seems to have class in it one too many times... renamed to imclass_package. 2013-01-17 08:13:04 +00:00
Brant K. Kyser
862d27f05a Fix issue of package directory not being created when using jniclasspackage pragma. General cleanup of implementation. 2013-01-17 08:13:04 +00:00
Brant K. Kyser
3bdcb14117 Add jniclasspackage pragma & change error regarding use of nspace without -package to warning. 2013-01-17 08:13:03 +00:00
Marko Klopcic
7984516b31 implemented translation of HTML tags - they are handled as a special class of commands 2013-01-16 23:15:14 +01:00
William S Fulton
0e6af5c0ea Fix cstype typemap lookup for member variables so that a fully qualified variable name matches 2013-01-15 06:45:47 +00:00
Marko Klopcic
32f34e16be improved commands for escaped characters 2013-01-13 20:02:39 +01:00
William S Fulton
7841a0d097 Remove cvs/svn Id strings 2013-01-12 01:21:16 +00:00
William S Fulton
5889d7bfdd Merge branch 'SFbug1299' of https://github.com/BrantKyser/swig into BrantKyser-SFbug1299 2013-01-11 23:12:06 +00:00
William S Fulton
13d9e19cdb Fix spacing in generated code for csdirectorin 'pre', 'post' and 'terminator' attributes. Add some more tests for these attributes. 2013-01-11 19:47:10 +00:00
Marko Klopcic
a9ef35bc66 Parsing of comments to tokens rewritten so that html entities and html tags are now treated as commands. Whitespaces are also preserved more acurately, so some doxygen tests fail at the moment 2013-01-10 08:51:56 +01:00
m
dd775a6ca9 Files Token.cpp and TokenList.cpp removed from makefile. TokenList was replaced with std::vecor, Token is now nested class of DoxygenParser 2013-01-10 08:28:20 +01:00
Brant K. Kyser
e1a59ae2c7 Clean up local variable name that store the director class's name to prevent confusion with the class name. 2013-01-08 21:38:57 -06:00
Brant K. Kyser
6cb5b5487f Use NSPACE_SEPARATOR rather than liter string for package seperator. 2013-01-08 21:28:13 -06:00
Vladimir Kalinin
2b407f4b27 SF Patch#268 - Add 'pre', 'post' and 'terminator' attributes to the csdirectorin typemap
"csdirectorin" "pre:" and "post" code attributes in C# module. Without them it is
not trivial to marshal strings and smart-pointers back and forth
between user callback code and native code. (especially by reference)

Also fixes 2 minor issues in director code generation that are
difficult to come by until "csdirectorin" attribute is extended.
The first is that "ref" types used in directors lead to invalid
signature generation (the type array used to match methods possibly
overloaded by user). typeof(ref T) is used instead of
typeof().MakeByRefType()
The second is that ignored director methods are not completely ignored
- if there was a %typemap(imtype, "directorinattributes") it is not
skipped for ignored method.
2013-01-09 00:11:41 +00:00
Olly Betts
f9566ad2df Fix assorted typos.
From https://sourceforge.net/p/swig/patches/332/ and some others too.
2013-01-08 18:47:40 +13:00
Olly Betts
0dd11cdd8d Fix to work with a ZTS build of PHP (broken in 2.0.7) 2013-01-08 18:33:47 +13:00
William S Fulton
3f1d77ee0f Merge branch 'SFbug1296' of https://github.com/ptomulik/swig into ptomulik-SFbug1296 2013-01-05 20:13:19 +00:00
Brant K. Kyser
c62cd63f71 Patch for SourceForge Bug #1299 broke D and C#. Update C# module to reflect these changes. 2013-01-05 05:25:33 -06:00
Brant K. Kyser
b005c68009 Patch for SourceForge Bug #1299 broke D and C#. Update D module to reflect these changes
NOTE: There are several test failures in the D test suite, so it is difficult to be entirely sure this does not break something.
2013-01-05 04:54:02 -06:00
Brant K. Kyser
3c12306b21 Remove extra underscore from generated director names to maintain prevent breaking languages that do not support nspace. 2013-01-05 03:40:06 -06:00
Brant K. Kyser
54b576d8b2 Merge in upstream changes 2013-01-05 02:26:15 -06:00
William S Fulton
328d6d01bb Cosmetic whitespace change 2013-01-04 20:35:13 +00:00
Paweł Tomulik
02246d7294 applied patch for SF bug #1296 2013-01-04 18:24:57 +01:00
Brant K. Kyser
747b50e2d7 Clean up fix for SourceForge Bug #1299. 2013-01-03 23:10:28 -06:00
Brant K. Kyser
d5d7655544 Merge branch 'master' into SFbug1299 2013-01-03 21:26:47 -06:00
Brant K. Kyser
f6ce5f089f Qualify generated SwigDirector class names with namespaces 2013-01-03 21:26:08 -06:00
Brant K. Kyser
540ede0dd3 Fix for SourceForge Bug #1283.
* Change the name of the memory own variable for base java director classes to match that expected by the director code
* Add conditional to appropriately dynamically cast director classes wrapped in smart pointers.
2013-01-04 00:31:55 +00:00