New implementation of long variable names. Each variable has a

[pspp] / src / compute.c

diff --git a/src/compute.c b/src/compute.c
index 2152b6db1a71e5addcd30cad2a56b2c1860656f4..24148fe68f94b55af0a1d0b3941dc6f10ebb0139 100644 (file)
--- a/src/compute.c
+++ b/src/compute.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "error.h"
@@ -315,7 +315,7 @@ struct lvalue
     struct expression *element;  /* Destination vector element, or NULL. */
   };
 
-/* Parses the target variable or vector elector into a new
+/* Parses the target variable or vector element into a new
    `struct lvalue', which is returned. */
 static struct lvalue *
 lvalue_parse (void) 
@@ -353,8 +353,7 @@ lvalue_parse (void)
   else
     {
       /* Variable name. */
-      strncpy (lvalue->var_name, tokid, LONG_NAME_LEN);
-      lvalue->var_name[LONG_NAME_LEN] = '\0';
+      st_trim_copy (lvalue->var_name, tokid, sizeof lvalue->var_name);
       lex_get ();
     }
   return lvalue;
@@ -371,8 +370,7 @@ lvalue_get_type (const struct lvalue *lvalue)
 {
   if (lvalue->vector == NULL) 
     {
-      struct variable *var
-        = dict_lookup_var (default_dict, lvalue->var_name);
+      struct variable *var = dict_lookup_var (default_dict, lvalue->var_name);
       if (var == NULL)
         return NUMERIC;
       else