diff options
| author | Ayberk Tosun <ayberk.tosun@gmail.com> | 2017-08-21 16:28:10 +0300 |
|---|---|---|
| committer | Ayberk Tosun <ayberk.tosun@gmail.com> | 2017-08-21 16:28:10 +0300 |
| commit | 36b5707b5a8cdcf7e5388b2b0976c84386ae6709 (patch) | |
| tree | c0718eeeaeffffe0e572183f90aa03775bf76fc5 | |
| parent | efa60951f9da66c9e4d5d38af506de74e7570b74 (diff) | |
| parent | 38fd84a28c08ec1bc2b8dba84b4bbf09039cd794 (diff) | |
Merge remote-tracking branch 'remotes/upstream/master'
| -rw-r--r-- | .gitignore | 42 | ||||
| -rw-r--r-- | examples/app/Makefile | 3 | ||||
| -rw-r--r-- | src/runtime/c/pgf/linearizer.c | 12 |
3 files changed, 56 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 167aa43e6..8bcdd3c46 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,43 @@ +*.class +*.la +*.o +*.lo +*.jar *.gfo +*.pgf +dist/ +src/runtime/c/.libs/ +src/runtime/c/Makefile +src/runtime/c/Makefile.in +src/runtime/c/aclocal.m4 +src/runtime/c/autom4te.cache/ +src/runtime/c/config.h +src/runtime/c/config.h.in +src/runtime/c/config.log +src/runtime/c/config.status +src/runtime/c/configure +src/runtime/c/gu/.deps/ +src/runtime/c/gu/.dirstamp +src/runtime/c/libgu.pc +src/runtime/c/libpgf.pc +src/runtime/c/libsg.pc +src/runtime/c/libtool +src/runtime/c/m4/libtool.m4 +src/runtime/c/m4/ltoptions.m4 +src/runtime/c/m4/ltsugar.m4 +src/runtime/c/m4/ltversion.m4 +src/runtime/c/m4/lt~obsolete.m4 +src/runtime/c/pgf/.deps/ +src/runtime/c/pgf/.dirstamp +src/runtime/c/pgf/lightning/asm.h +src/runtime/c/pgf/lightning/core.h +src/runtime/c/pgf/lightning/fp.h +src/runtime/c/pgf/lightning/funcs.h +src/runtime/c/scripts/ +src/runtime/c/sg/.deps/ +src/runtime/c/sg/.dirstamp +src/runtime/c/stamp-h1 +src/runtime/java/.libs/ +src/runtime/python/build/ +src/ui/android/libs/ +src/ui/android/obj/ diff --git a/examples/app/Makefile b/examples/app/Makefile index 7c004600e..a69df95de 100644 --- a/examples/app/Makefile +++ b/examples/app/Makefile @@ -33,6 +33,9 @@ App15.pgf: $(APP15) App16.pgf: $(APP16) $(GFMKT) -name=App16 $(APP16) +RTS -K200M +App17.pgf: $(APP17) + $(GFMKT) -name=App16 $(APP17) +RTS -K200M + # Without dependencies: App11: $(GFMKT) -name=App11 $(APP11) +RTS -K200M diff --git a/src/runtime/c/pgf/linearizer.c b/src/runtime/c/pgf/linearizer.c index a921de61a..f18a3e55a 100644 --- a/src/runtime/c/pgf/linearizer.c +++ b/src/runtime/c/pgf/linearizer.c @@ -1125,7 +1125,17 @@ pgf_file_lzn_symbol_meta(PgfLinFuncs** funcs, PgfMetaId id) flin->capit = PGF_CAPIT_NONE; } - gu_putc('?', flin->out, flin->err); + gu_putc('?', flin->out, flin->err); + + switch (flin->capit) { + case PGF_CAPIT_FIRST: + flin->capit = PGF_CAPIT_NONE; + break; + case PGF_CAPIT_ALL: + flin->capit = PGF_CAPIT_NEXT; + break; + default:; + } } static PgfLinFuncs pgf_file_lin_funcs = { |