[pure-lang-svn] SF.net SVN: pure-lang: [319] pure/trunk

[<ag...@us...>]

Revision: 319
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=319&view=rev
Author:   agraef
Date:     2008-06-26 17:27:54 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
Bugfix in new completion functions.

Modified Paths:
--------------
    pure/trunk/lexer.ll
    pure/trunk/pure.cc

Modified: pure/trunk/lexer.ll
===================================================================
--- pure/trunk/lexer.ll	2008-06-27 00:24:41 UTC (rev 318)
+++ pure/trunk/lexer.ll	2008-06-27 00:27:54 UTC (rev 319)
@@ -171,7 +171,8 @@
   while (it != end) {
     int32_t f = it->second.f;
     /* Skip non-toplevel symbols. */
-    if (interp.globalvars.find(f) == interp.globalvars.end() &&
+    if (interp.globenv.find(f) == interp.globenv.end() &&
+	interp.globalvars.find(f) == interp.globalvars.end() &&
 	interp.externals.find(f) == interp.externals.end()) {
       it++;
       continue;

Modified: pure/trunk/pure.cc
===================================================================
--- pure/trunk/pure.cc	2008-06-27 00:24:41 UTC (rev 318)
+++ pure/trunk/pure.cc	2008-06-27 00:27:54 UTC (rev 319)
@@ -89,7 +89,8 @@
   while (it != end) {
     int32_t f = it->second.f;
     /* Skip non-toplevel symbols. */
-    if (interp.globalvars.find(f) == interp.globalvars.end() &&
+    if (interp.globenv.find(f) == interp.globenv.end() &&
+	interp.globalvars.find(f) == interp.globalvars.end() &&
 	interp.externals.find(f) == interp.externals.end()) {
       it++;
       continue;
@@ -127,7 +128,8 @@
   while (it != end) {
     int32_t f = it->second.f;
     /* Skip non-toplevel symbols. */
-    if (interp.globalvars.find(f) == interp.globalvars.end() &&
+    if (interp.globenv.find(f) == interp.globenv.end() &&
+	interp.globalvars.find(f) == interp.globalvars.end() &&
 	interp.externals.find(f) == interp.externals.end()) {
       it++;
       continue;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.