summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAarne Ranta <aarne@chalmers.se>2017-08-21 16:20:27 +0300
committerAarne Ranta <aarne@chalmers.se>2017-08-21 16:20:27 +0300
commit38fd84a28c08ec1bc2b8dba84b4bbf09039cd794 (patch)
treeaa95ce96599ecedbbccb29c840ccac3c75a67520
parentf7312b3f4cf68064335bfce0e93811974505f3bd (diff)
parentdbac0b184f7aad3df33a28983937d5f2de8ae920 (diff)
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
-rw-r--r--.gitignore44
-rw-r--r--src/runtime/c/pgf/linearizer.c12
2 files changed, 55 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..7bed8bc54
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,44 @@
+*.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/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 = {