From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Helmut Eller Newsgroups: gmane.emacs.bugs Subject: bug#25071: 26.0.50; Various Forth related improvements for etags Date: Wed, 30 Nov 2016 20:32:21 +0100 Message-ID: References: <83inr5q9i4.fsf@gnu.org> <83vav4q2pq.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1480534397 17005 195.159.176.226 (30 Nov 2016 19:33:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 30 Nov 2016 19:33:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: 25071@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 30 20:33:11 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCAcw-0003W5-My for geb-bug-gnu-emacs@m.gmane.org; Wed, 30 Nov 2016 20:33:11 +0100 Original-Received: from localhost ([::1]:46007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCAd0-0000kl-FZ for geb-bug-gnu-emacs@m.gmane.org; Wed, 30 Nov 2016 14:33:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCAcs-0000kU-9B for bug-gnu-emacs@gnu.org; Wed, 30 Nov 2016 14:33:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCAco-0005n7-Ux for bug-gnu-emacs@gnu.org; Wed, 30 Nov 2016 14:33:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cCAco-0005mz-PC for bug-gnu-emacs@gnu.org; Wed, 30 Nov 2016 14:33:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cCAco-0006pn-FH for bug-gnu-emacs@gnu.org; Wed, 30 Nov 2016 14:33:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Helmut Eller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 30 Nov 2016 19:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25071 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 25071-submit@debbugs.gnu.org id=B25071.148053436626247 (code B ref 25071); Wed, 30 Nov 2016 19:33:02 +0000 Original-Received: (at 25071) by debbugs.gnu.org; 30 Nov 2016 19:32:46 +0000 Original-Received: from localhost ([127.0.0.1]:47793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCAcX-0006pG-VU for submit@debbugs.gnu.org; Wed, 30 Nov 2016 14:32:46 -0500 Original-Received: from mail-wm0-f53.google.com ([74.125.82.53]:35990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCAcR-0006ox-VY for 25071@debbugs.gnu.org; Wed, 30 Nov 2016 14:32:44 -0500 Original-Received: by mail-wm0-f53.google.com with SMTP id g23so278309934wme.1 for <25071@debbugs.gnu.org>; Wed, 30 Nov 2016 11:32:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=EWjtkkCWXbx6Rsc9nIOVGvpeVi1kTAXAG9mWAi608fs=; b=Ej0ZHhJI+DJv795SVxt/t8G1cvTunFR3fhDY17S1RLDxchXeRhH7fdENOVETrMJbFe 9S4i29rZpSxFfWgC6qTRDivmhwcGu1l8L9nul/wtALmgc7aG57fDAwl64ND0exRrD+dj 7ge7ZEZ/kNXW0aGYfsxLjw+JyYwOZD+boTE4ut/3R+uv9+GmhnHLvxjCWRXBsAFJCo+q zCQYZMqMofe9ksI+t6h32SGGZS7TiU1nK4dRdavuDG5zCU0I1HUv3NHdGlKNc4CwGbzA LZ1GcJmOTk+wbTLL9l5ZwikRdV/GyXh7L9gqjIkRWMNSm3yL+zLQlG7fr2uvU9WBBT1D 34wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=EWjtkkCWXbx6Rsc9nIOVGvpeVi1kTAXAG9mWAi608fs=; b=ZTp2A/X+KDxDvP3RJA9/v4OBUFudIGzeCWLzBklga2hcKIDL6HxZAv3ZuX1y8h2bUh lNaloD6VoS9GyrVSmFRtRYKusUmJ+0S+IJBVHmJZDKfGbZSy1Ih+sEe55jtFktxudfpZ a9fNNRbSG80lHBAicdXqxyTU0jNcTittUhX3XJiygLY9MJIwwKm/00mPM3gOjWPtMDbe 5FbzJyrnHCjxlrfiMQGqzOnLZwQpyZKDrRKodnpZ9MhaD8KaomFGBPXRJu01odmqTwH9 HQAykhwtbPEj1UEhoTPf54Wt3rSCw4nmShLSMsUtYukFiYuCpT7G8d5eTdI2bF8TG24v Dmvw== X-Gm-Message-State: AKaTC025iJmN3mV1lFFoFwvsnqhoAbmLKxvAbHJbXa59D8AuAGQmyweoz85snp34VkruAQ== X-Received: by 10.28.93.74 with SMTP id r71mr28485794wmb.67.1480534354055; Wed, 30 Nov 2016 11:32:34 -0800 (PST) Original-Received: from caladan (dial-181252.pool.broadband44.net. [212.46.181.252]) by smtp.gmail.com with ESMTPSA id f10sm74418840wjl.28.2016.11.30.11.32.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Nov 2016 11:32:33 -0800 (PST) In-Reply-To: <83vav4q2pq.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 30 Nov 2016 19:47:45 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:126329 Archived-At: --=-=-= Content-Type: text/plain On Wed, Nov 30 2016, Eli Zaretskii wrote: >> Yes, the TAGS file becomes at most twice as big. That's a minor >> disadvantage that I'm happy to trade for even tiny improvements in >> precision. > > It clearly isn't a catastrophe, if doing that is necessary. I just > want to be sure that all Forth tags need to be explicit. Is there > perhaps some reasonably easy way to make only those tags explicit > which actually use the special characters that require it? OK. Here's an updated patch. It calls make_tag instead of pfnote. make_tag tries to use implicit names if possible. If it's not possible, it creates an explicit name. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Various-Forth-related-improvements-for-etags.patch Content-Transfer-Encoding: 8bit >From 3403c19bdae76e4bb33b25108383c8cbf6bf30d8 Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 30 Nov 2016 20:25:26 +0100 Subject: [PATCH] Various Forth related improvements for etags Generate correct tags names for things like "(foo)". Previously "(foo" created. Fix a bug where a tag for "-bar" was created when encountering things like "create-bar". Recognize more words from the Forth-2012 Standard. * lib-src/etags.c (Forth_words): Check for whitespace after defining words. Create tag with make_tag instead of get_tag to avoid notiname which isn't appropriate for Forth. * test/manual/etags/forth-src/test-forth.fth: Add some test cases. * test/manual/etags/ETAGS.good_1: * test/manual/etags/ETAGS.good_2: * test/manual/etags/ETAGS.good_3: * test/manual/etags/ETAGS.good_4: * test/manual/etags/ETAGS.good_5: * test/manual/etags/ETAGS.good_6: * test/manual/etags/CTAGS.good: Adapt to the changes in etags.c and new test cases. --- lib-src/etags.c | 41 ++++++++++++++++++++++-------- test/manual/etags/CTAGS.good | 15 ++++++++++- test/manual/etags/ETAGS.good_1 | 23 +++++++++++++---- test/manual/etags/ETAGS.good_2 | 23 +++++++++++++---- test/manual/etags/ETAGS.good_3 | 23 +++++++++++++---- test/manual/etags/ETAGS.good_4 | 23 +++++++++++++---- test/manual/etags/ETAGS.good_5 | 23 +++++++++++++---- test/manual/etags/ETAGS.good_6 | 23 +++++++++++++---- test/manual/etags/forth-src/test-forth.fth | 21 +++++++++++++++ 9 files changed, 174 insertions(+), 41 deletions(-) diff --git a/lib-src/etags.c b/lib-src/etags.c index 6a722e0..7baa2a3 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -5469,16 +5469,37 @@ Forth_words (FILE *inf) do /* skip to ) or eol */ bp++; while (*bp != ')' && *bp != '\0'); - else if ((bp[0] == ':' && c_isspace (bp[1]) && bp++) - || LOOKING_AT_NOCASE (bp, "constant") - || LOOKING_AT_NOCASE (bp, "code") - || LOOKING_AT_NOCASE (bp, "create") - || LOOKING_AT_NOCASE (bp, "defer") - || LOOKING_AT_NOCASE (bp, "value") - || LOOKING_AT_NOCASE (bp, "variable") - || LOOKING_AT_NOCASE (bp, "buffer:") - || LOOKING_AT_NOCASE (bp, "field")) - get_tag (skip_spaces (bp), NULL); /* Yay! A definition! */ + else if (((bp[0] == ':' && c_isspace (bp[1]) && bp++) + || LOOKING_AT_NOCASE (bp, "constant") + || LOOKING_AT_NOCASE (bp, "2constant") + || LOOKING_AT_NOCASE (bp, "fconstant") + || LOOKING_AT_NOCASE (bp, "code") + || LOOKING_AT_NOCASE (bp, "create") + || LOOKING_AT_NOCASE (bp, "defer") + || LOOKING_AT_NOCASE (bp, "value") + || LOOKING_AT_NOCASE (bp, "2value") + || LOOKING_AT_NOCASE (bp, "fvalue") + || LOOKING_AT_NOCASE (bp, "variable") + || LOOKING_AT_NOCASE (bp, "2variable") + || LOOKING_AT_NOCASE (bp, "fvariable") + || LOOKING_AT_NOCASE (bp, "buffer:") + || LOOKING_AT_NOCASE (bp, "field:") + || LOOKING_AT_NOCASE (bp, "+field") + || LOOKING_AT_NOCASE (bp, "field") /* not standard? */ + || LOOKING_AT_NOCASE (bp, "begin-structure") + || LOOKING_AT_NOCASE (bp, "synonym") + ) + && c_isspace (bp[0])) + { + /* Yay! A definition! */ + char* name_start = skip_spaces (bp); + char* name_end = skip_non_spaces (name_start); + if (name_start < name_end) + make_tag (name_start, name_end - name_start, + true, lb.buffer, name_end - lb.buffer, + lineno, linecharno); + bp = name_end; + } else bp = skip_non_spaces (bp); } diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good index e652989..6f9df19 100644 --- a/test/manual/etags/CTAGS.good +++ b/test/manual/etags/CTAGS.good @@ -36,7 +36,8 @@ ${CHECKOBJS} make-src/Makefile /^${CHECKOBJS}: CFLAGS=-g3 -DNULLFREECHECK=0$/ ($prog,$_,@list perl-src/yagrip.pl 39 ($string,$flag,@string,@temp,@last perl-src/yagrip.pl 40 (a-forth-constant forth-src/test-forth.fth /^constant (a-forth-constant$/ -(another-forth-word forth-src/test-forth.fth /^: (another-forth-word) ( -- )$/ +(another-forth-word) forth-src/test-forth.fth /^: (another-forth-word) ( -- )$/ +(foo) forth-src/test-forth.fth /^: (foo) 1 ;$/ + ruby-src/test.rb /^ def +(y)$/ + tex-src/texinfo.tex /^\\def+{{\\tt \\char 43}}$/ .PRECIOUS make-src/Makefile /^.PRECIOUS: ETAGS CTAGS ETAGS16 CTAGS16 ETAGS17 CTA/ @@ -170,6 +171,9 @@ ${CHECKOBJS} make-src/Makefile /^${CHECKOBJS}: CFLAGS=-g3 -DNULLFREECHECK=0$/ /wbytes ps-src/rfc1245.ps /^\/wbytes { $/ /wh ps-src/rfc1245.ps /^\/wh { $/ /yen ps-src/rfc1245.ps /^\/yen \/.notdef \/.notdef \/.notdef \/.notdef \/.notdef / +2const forth-src/test-forth.fth /^3 4 2constant 2const$/ +2val forth-src/test-forth.fth /^2const 2value 2val$/ +2var forth-src/test-forth.fth /^2variable 2var$/ :a-forth-dictionary-entry forth-src/test-forth.fth /^create :a-forth-dictionary-entry$/ < tex-src/texinfo.tex /^\\def<{{\\tt \\less}}$/ << ruby-src/test.rb /^ def <<(y)$/ @@ -2725,6 +2729,7 @@ counter cp-src/c.C 36 cow cp-src/c.C 127 cow cp-src/c.C 131 cplpl c-src/etags.c 2935 +create-bar forth-src/test-forth.fth /^: create-bar foo ;$/ createPOEntries php-src/lce_functions.php /^ function createPOEntries()$/ createWidgets pyt-src/server.py /^ def createWidgets(self, host):$/ createWidgets pyt-src/server.py /^ def createWidgets(self):$/ @@ -2944,6 +2949,7 @@ fastmap c-src/emacs/src/regex.h 355 fastmap_accurate c-src/emacs/src/regex.h 383 fatal c-src/etags.c /^fatal (const char *s1, const char *s2)$/ fatala c.c /^void fatala () __attribute__ ((noreturn));$/ +fconst forth-src/test-forth.fth /^3.1415e fconstant fconst$/ fdHandler objc-src/Subprocess.m /^- fdHandler:(int)theFd$/ fdHandler objc-src/Subprocess.m /^fdHandler (int theFd, id self)$/ fdefunkey c-src/etags.c 2409 @@ -3015,6 +3021,7 @@ foo cp-src/x.cc /^XX::foo()$/ foo f-src/entry.for /^ character*(*) function foo()$/ foo f-src/entry.strange_suffix /^ character*(*) function foo()$/ foo f-src/entry.strange /^ character*(*) function foo()$/ +foo forth-src/test-forth.fth /^: foo (foo) ;$/ foo php-src/ptest.php /^foo()$/ foo ruby-src/test1.ru /^ attr_reader :foo$/ foo! ruby-src/test1.ru /^ def foo!$/ @@ -3057,6 +3064,8 @@ function c-src/emacs/src/lisp.h 694 function c-src/emacs/src/lisp.h 1685 function c-src/emacs/src/lisp.h 2197 functionp c-src/emacs/src/lisp.h /^functionp (Lisp_Object object)$/ +fval forth-src/test-forth.fth /^fconst fvalue fval$/ +fvar forth-src/test-forth.fth /^fvariable fvar$/ fvdef c-src/etags.c 2418 fvextern c-src/etags.c 2420 fvnameseen c-src/etags.c 2412 @@ -3515,6 +3524,7 @@ my_struct c.c 226 my_struct c-src/h.h 91 my_typedef c.c 228 my_typedef c-src/h.h 93 +mypi forth-src/test-forth.fth /^synonym mypi fconst$/ n c-src/exit.c 28 n c-src/exit.strange_suffix 28 name c-src/getopt.h 76 @@ -3719,6 +3729,8 @@ outputtable html-src/algrthms.html /^Output$/ outsyn prol-src/natded.prolog /^outsyn(['Any'],_).$/ p c-src/emacs/src/lisp.h 4673 p c-src/emacs/src/lisp.h 4679 +p.x forth-src/test-forth.fth /^ 1 CELLS +FIELD p.x \\ A single cell filed name/ +p.y forth-src/test-forth.fth /^ 1 CELLS +FIELD p.y \\ A single cell field name/ p/f ada-src/etags-test-for.ada /^ function p pragma Import (C,$/ p/f ada-src/etags-test-for.ada /^function p ("p");$/ pD c-src/emacs/src/lisp.h 165 @@ -3767,6 +3779,7 @@ plist c-src/emacs/src/lisp.h 697 plus cp-src/functions.cpp /^void Date::plus ( int days , int month , int year / plus go-src/test1.go 5 plusvalseq prol-src/natded.prolog /^plusvalseq([]) --> [].$/ +point forth-src/test-forth.fth /^BEGIN-STRUCTURE point \\ create the named structure/ pointer c-src/emacs/src/lisp.h 2125 poll_for_input c-src/emacs/src/keyboard.c /^poll_for_input (struct atimer *timer)$/ poll_for_input_1 c-src/emacs/src/keyboard.c /^poll_for_input_1 (void)$/ diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1 index 374692c..b3bd241 100644 --- a/test/manual/etags/ETAGS.good_1 +++ b/test/manual/etags/ETAGS.good_1 @@ -2311,19 +2311,32 @@ f-src/entry.strange,172 & intensity1(577,12231 character*(*) function foo(579,12307 -forth-src/test-forth.fth,408 -: a-forth-word 20,301 +forth-src/test-forth.fth,733 +: a-forth-word20,301 99 constant a-forth-constant!22,343 55 value a-forth-value?23,373 create :a-forth-dictionary-entry24,397 defer #a-defer-word27,460 -: (another-forth-word)(another-forth-word29,481 +: (another-forth-word)(another-forth-word)29,481 9 field >field136,582 5 field >field237,605 constant (a-forth-constant(a-forth-constant38,628 2000 buffer: #some-storage41,657 -code assemby-code-word 43,685 -: a-forth-word 50,870 +code assemby-code-word43,685 +: a-forth-word50,870 +: (foo)(foo)55,988 +: foo56,1000 +: create-bar58,1015 +3 4 2constant 2const61,1074 +2const 2value 2val62,1095 +2variable 2var63,1114 +3.1415e fconstant fconst65,1130 +fconst fvalue fval66,1155 +fvariable fvar67,1174 +synonym mypi69,1190 +BEGIN-STRUCTURE point71,1211 + 1 CELLS +FIELD p.x72,1262 + 1 CELLS +FIELD p.y73,1318 go-src/test.go,48 package main1,0 diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2 index a21717a..170d845 100644 --- a/test/manual/etags/ETAGS.good_2 +++ b/test/manual/etags/ETAGS.good_2 @@ -2880,19 +2880,32 @@ f-src/entry.strange,172 & intensity1(577,12231 character*(*) function foo(579,12307 -forth-src/test-forth.fth,408 -: a-forth-word 20,301 +forth-src/test-forth.fth,733 +: a-forth-word20,301 99 constant a-forth-constant!22,343 55 value a-forth-value?23,373 create :a-forth-dictionary-entry24,397 defer #a-defer-word27,460 -: (another-forth-word)(another-forth-word29,481 +: (another-forth-word)(another-forth-word)29,481 9 field >field136,582 5 field >field237,605 constant (a-forth-constant(a-forth-constant38,628 2000 buffer: #some-storage41,657 -code assemby-code-word 43,685 -: a-forth-word 50,870 +code assemby-code-word43,685 +: a-forth-word50,870 +: (foo)(foo)55,988 +: foo56,1000 +: create-bar58,1015 +3 4 2constant 2const61,1074 +2const 2value 2val62,1095 +2variable 2var63,1114 +3.1415e fconstant fconst65,1130 +fconst fvalue fval66,1155 +fvariable fvar67,1174 +synonym mypi69,1190 +BEGIN-STRUCTURE point71,1211 + 1 CELLS +FIELD p.x72,1262 + 1 CELLS +FIELD p.y73,1318 go-src/test.go,48 package main1,0 diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3 index 33bf110..1d75314 100644 --- a/test/manual/etags/ETAGS.good_3 +++ b/test/manual/etags/ETAGS.good_3 @@ -2628,19 +2628,32 @@ f-src/entry.strange,172 & intensity1(577,12231 character*(*) function foo(579,12307 -forth-src/test-forth.fth,408 -: a-forth-word 20,301 +forth-src/test-forth.fth,733 +: a-forth-word20,301 99 constant a-forth-constant!22,343 55 value a-forth-value?23,373 create :a-forth-dictionary-entry24,397 defer #a-defer-word27,460 -: (another-forth-word)(another-forth-word29,481 +: (another-forth-word)(another-forth-word)29,481 9 field >field136,582 5 field >field237,605 constant (a-forth-constant(a-forth-constant38,628 2000 buffer: #some-storage41,657 -code assemby-code-word 43,685 -: a-forth-word 50,870 +code assemby-code-word43,685 +: a-forth-word50,870 +: (foo)(foo)55,988 +: foo56,1000 +: create-bar58,1015 +3 4 2constant 2const61,1074 +2const 2value 2val62,1095 +2variable 2var63,1114 +3.1415e fconstant fconst65,1130 +fconst fvalue fval66,1155 +fvariable fvar67,1174 +synonym mypi69,1190 +BEGIN-STRUCTURE point71,1211 + 1 CELLS +FIELD p.x72,1262 + 1 CELLS +FIELD p.y73,1318 go-src/test.go,48 package main1,0 diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4 index 3d9d626..e74db28 100644 --- a/test/manual/etags/ETAGS.good_4 +++ b/test/manual/etags/ETAGS.good_4 @@ -2475,19 +2475,32 @@ f-src/entry.strange,172 & intensity1(577,12231 character*(*) function foo(579,12307 -forth-src/test-forth.fth,408 -: a-forth-word 20,301 +forth-src/test-forth.fth,733 +: a-forth-word20,301 99 constant a-forth-constant!22,343 55 value a-forth-value?23,373 create :a-forth-dictionary-entry24,397 defer #a-defer-word27,460 -: (another-forth-word)(another-forth-word29,481 +: (another-forth-word)(another-forth-word)29,481 9 field >field136,582 5 field >field237,605 constant (a-forth-constant(a-forth-constant38,628 2000 buffer: #some-storage41,657 -code assemby-code-word 43,685 -: a-forth-word 50,870 +code assemby-code-word43,685 +: a-forth-word50,870 +: (foo)(foo)55,988 +: foo56,1000 +: create-bar58,1015 +3 4 2constant 2const61,1074 +2const 2value 2val62,1095 +2variable 2var63,1114 +3.1415e fconstant fconst65,1130 +fconst fvalue fval66,1155 +fvariable fvar67,1174 +synonym mypi69,1190 +BEGIN-STRUCTURE point71,1211 + 1 CELLS +FIELD p.x72,1262 + 1 CELLS +FIELD p.y73,1318 go-src/test.go,48 package main1,0 diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5 index 1dff768..e278678 100644 --- a/test/manual/etags/ETAGS.good_5 +++ b/test/manual/etags/ETAGS.good_5 @@ -3361,19 +3361,32 @@ f-src/entry.strange,172 & intensity1(577,12231 character*(*) function foo(579,12307 -forth-src/test-forth.fth,408 -: a-forth-word 20,301 +forth-src/test-forth.fth,733 +: a-forth-word20,301 99 constant a-forth-constant!22,343 55 value a-forth-value?23,373 create :a-forth-dictionary-entry24,397 defer #a-defer-word27,460 -: (another-forth-word)(another-forth-word29,481 +: (another-forth-word)(another-forth-word)29,481 9 field >field136,582 5 field >field237,605 constant (a-forth-constant(a-forth-constant38,628 2000 buffer: #some-storage41,657 -code assemby-code-word 43,685 -: a-forth-word 50,870 +code assemby-code-word43,685 +: a-forth-word50,870 +: (foo)(foo)55,988 +: foo56,1000 +: create-bar58,1015 +3 4 2constant 2const61,1074 +2const 2value 2val62,1095 +2variable 2var63,1114 +3.1415e fconstant fconst65,1130 +fconst fvalue fval66,1155 +fvariable fvar67,1174 +synonym mypi69,1190 +BEGIN-STRUCTURE point71,1211 + 1 CELLS +FIELD p.x72,1262 + 1 CELLS +FIELD p.y73,1318 go-src/test.go,48 package main1,0 diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6 index fdcbd57..68e474d 100644 --- a/test/manual/etags/ETAGS.good_6 +++ b/test/manual/etags/ETAGS.good_6 @@ -3361,19 +3361,32 @@ f-src/entry.strange,172 & intensity1(577,12231 character*(*) function foo(579,12307 -forth-src/test-forth.fth,408 -: a-forth-word 20,301 +forth-src/test-forth.fth,733 +: a-forth-word20,301 99 constant a-forth-constant!22,343 55 value a-forth-value?23,373 create :a-forth-dictionary-entry24,397 defer #a-defer-word27,460 -: (another-forth-word)(another-forth-word29,481 +: (another-forth-word)(another-forth-word)29,481 9 field >field136,582 5 field >field237,605 constant (a-forth-constant(a-forth-constant38,628 2000 buffer: #some-storage41,657 -code assemby-code-word 43,685 -: a-forth-word 50,870 +code assemby-code-word43,685 +: a-forth-word50,870 +: (foo)(foo)55,988 +: foo56,1000 +: create-bar58,1015 +3 4 2constant 2const61,1074 +2const 2value 2val62,1095 +2variable 2var63,1114 +3.1415e fconstant fconst65,1130 +fconst fvalue fval66,1155 +fvariable fvar67,1174 +synonym mypi69,1190 +BEGIN-STRUCTURE point71,1211 + 1 CELLS +FIELD p.x72,1262 + 1 CELLS +FIELD p.y73,1318 go-src/test.go,48 package main1,0 diff --git a/test/manual/etags/forth-src/test-forth.fth b/test/manual/etags/forth-src/test-forth.fth index ce4069d..4521d32 100644 --- a/test/manual/etags/forth-src/test-forth.fth +++ b/test/manual/etags/forth-src/test-forth.fth @@ -51,3 +51,24 @@ c; a-forth-word dup 200 > abort" Eek. The number is too big" ." Result is " . cr ; + +: (foo) 1 ; +: foo (foo) ; + +: create-bar foo ; +create-bar \ Do NOT create a tag here + +3 4 2constant 2const +2const 2value 2val +2variable 2var + +3.1415e fconstant fconst +fconst fvalue fval +fvariable fvar + +synonym mypi fconst + +BEGIN-STRUCTURE point \ create the named structure + 1 CELLS +FIELD p.x \ A single cell filed named p.x + 1 CELLS +FIELD p.y \ A single cell field named p.y +END-STRUCTURE -- 2.1.4 --=-=-=--