Merge remote-tracking branch 'remotes/upstream/master'

This commit is contained in:
Ayberk Tosun
2017-08-21 16:28:10 +03:00
3 changed files with 56 additions and 1 deletions

42
.gitignore vendored
View File

@@ -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/

View File

@@ -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

View File

@@ -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 = {