rpms/gdl/devel gdl-0.9rc2-cvs.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gdl-0.9rc1-gcc43.patch, 1.1, 1.2 gdl.spec, 1.39, 1.40 sources, 1.10, 1.11 gdl-0.9rc1-cvs.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Mon Jan 26 16:52:34 UTC 2009


Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv679

Modified Files:
	.cvsignore gdl-0.9rc1-gcc43.patch gdl.spec sources 
Added Files:
	gdl-0.9rc2-cvs.patch 
Removed Files:
	gdl-0.9rc1-cvs.patch 
Log Message:
* Fri Jan 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc2.1
- Update to 0.9rc2 based cvs


gdl-0.9rc2-cvs.patch:

--- NEW FILE gdl-0.9rc2-cvs.patch ---
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/configure cvs/gdl/configure
--- gdl-0.9rc2/configure	2009-01-20 12:33:51.000000000 -0700
+++ cvs/gdl/configure	2009-01-26 09:43:53.000000000 -0700
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gdl 0.9rc1 CVS.
+# Generated by GNU Autoconf 2.61 for gdl 0.9rc2 CVS.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
 # Identity of this package.
 PACKAGE_NAME='gdl'
 PACKAGE_TARNAME='gdl'
-PACKAGE_VERSION='0.9rc1 CVS'
-PACKAGE_STRING='gdl 0.9rc1 CVS'
+PACKAGE_VERSION='0.9rc2 CVS'
+PACKAGE_STRING='gdl 0.9rc2 CVS'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1398,7 +1398,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gdl 0.9rc1 CVS to adapt to many kinds of systems.
+\`configure' configures gdl 0.9rc2 CVS to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,7 +1468,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gdl 0.9rc1 CVS:";;
+     short | recursive ) echo "Configuration of gdl 0.9rc2 CVS:";;
    esac
   cat <<\_ACEOF
 
@@ -1585,7 +1585,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gdl configure 0.9rc1 CVS
+gdl configure 0.9rc2 CVS
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1599,7 +1599,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gdl $as_me 0.9rc1 CVS, which was
+It was created by gdl $as_me 0.9rc2 CVS, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2292,7 +2292,7 @@
 
 # Define the identity of the package.
  PACKAGE='gdl'
- VERSION='0.9rc1 CVS'
+ VERSION='0.9rc2 CVS'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22298,7 +22298,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gdl $as_me 0.9rc1 CVS, which was
+This file was extended by gdl $as_me 0.9rc2 CVS, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22351,7 +22351,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gdl config.status 0.9rc1 CVS
+gdl config.status 0.9rc2 CVS
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/configure.in cvs/gdl/configure.in
--- gdl-0.9rc2/configure.in	2009-01-22 15:31:48.000000000 -0700
+++ cvs/gdl/configure.in	2009-01-26 09:43:53.000000000 -0700
@@ -1,4 +1,4 @@
-AC_INIT(gdl, 0.9rc2)
+AC_INIT(gdl, 0.9rc2 CVS)
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/README cvs/gdl/README
--- gdl-0.9rc2/README	2009-01-20 13:01:46.000000000 -0700
+++ cvs/gdl/README	2008-04-08 11:10:46.000000000 -0600
@@ -97,7 +97,6 @@
 compiler) is needed for compiling GDL.
 Note that due to problems with static casts g++ 3.3.1
 does NOT compile GDL, but 3.3.2 and 3.4.1 work fine again.
-Since 0.9rc2 GDL should compile with gcc 4.3 .
 GDL compiles under Mac OS X (10.2, 10.3) with g++ 3.3 . 
 
 The GNU readline library 4.3 is needed (actually GDL should compile
Only in gdl-0.9rc2/src: basic_fun.cpp.ori
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/basic_fun_jmg.cpp cvs/gdl/src/basic_fun_jmg.cpp
--- gdl-0.9rc2/src/basic_fun_jmg.cpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/basic_fun_jmg.cpp	2009-01-26 09:43:54.000000000 -0700
@@ -462,6 +462,11 @@
 
     SizeT nEl = p0->N_Elements();
     SizeT Rank = p0->Rank();
+//     if( Rank == 0)
+//       e->Throw( "Parameter must be an array in this context: " 
+// 		+ e->GetParString( 0));
+
+
     SizeT Type = p0->Type();
 
     dimension dim;
Only in gdl-0.9rc2/src: basic_pro.cpp.sav
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/dcompiler.cpp cvs/gdl/src/dcompiler.cpp
--- gdl-0.9rc2/src/dcompiler.cpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/dcompiler.cpp	2009-01-26 09:43:54.000000000 -0700
@@ -158,6 +158,12 @@
     }
 }
 
+void DCompiler::ContinueMainPro()
+{
+  env = GDLInterpreter::CallStack()[0];
+  pro = static_cast<DSubUD*>( env->GetPro());
+}
+
 void DCompiler::StartFun(const string& n,const string& o)
 {
   ClearOwnCommon();
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/dcompiler.hpp cvs/gdl/src/dcompiler.hpp
--- gdl-0.9rc2/src/dcompiler.hpp	2009-01-20 12:33:57.000000000 -0700
+++ cvs/gdl/src/dcompiler.hpp	2009-01-26 09:43:54.000000000 -0700
@@ -66,6 +66,7 @@
   void AddPar(const std::string&);                 // add parameter
   void AddKey(const std::string&,const std::string&);   // add keyword,varName
   void StartPro(const std::string&,const std::string& o = "");     
+  void ContinueMainPro();
   void EndFunPro();       
   void EndInteractiveStatement();
   void EndPro();       
@@ -88,6 +89,8 @@
   int  NDefLabel();
   bool IsActivePro( DSub* p);
   bool ActiveProCompiled() const { return activeProCompiled;}
+  EnvBaseT* GetEnv() const { return env;}
+  void SetEnv( EnvBaseT* e) { env = e;}
 };
 
 #endif
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/file.cpp cvs/gdl/src/file.cpp
--- gdl-0.9rc2/src/file.cpp	2009-01-20 12:33:57.000000000 -0700
+++ cvs/gdl/src/file.cpp	2008-11-12 17:03:31.000000000 -0700
@@ -165,6 +165,89 @@
     return res;
   }
 
+  BaseGDL* file_info( EnvT* e)
+  {
+    SizeT nParam=e->NParam( 1); 
+    
+    BaseGDL* p0 = e->GetParDefined( 0);
+
+    DStringGDL* p0S = dynamic_cast<DStringGDL*>( p0);
+    if( p0S == NULL)
+      e->Throw( "String expression required in this context: "+
+		e->GetParString(0));
+
+    static int directoryIx = e->KeywordIx( "NOEXPAND_PATH");
+    bool directory = e->KeywordSet( noexpand_pathIx);
+
+    DLongGDL* getMode = NULL; 
+    if( get_mode)
+      {
+	getMode = new DLongGDL( p0S->Dim()); // zero
+	e->SetKW( get_modeIx, getMode);
+      }
+    
+    DLongGDL* res = new DLongGDL( p0S->Dim()); // zero
+
+//     bool doStat = 
+//       zero_length || get_mode || directory || 
+//       regular || block_special || character_special || 
+//       named_pipe || socket || symlink;
+
+    SizeT nEl = p0S->N_Elements();
+    for( SizeT f=0; f<nEl; ++f)
+      {
+	const char* actFile = (*p0S)[ f].c_str();
+
+	struct stat statStruct;
[...8858 lines suppressed...]
+	_t = __t194;
 	_t = _t->getNextSibling();
 	uminus_AST = RefDNode(currentAST.root);
 	
@@ -6247,11 +6261,11 @@
 	RefDNode ex_AST = RefDNode(antlr::nullAST);
 	RefDNode ex = RefDNode(antlr::nullAST);
 	
-	RefDNode __t197 = _t;
+	RefDNode __t196 = _t;
 	e = (_t == RefDNode(ASTNULL)) ? RefDNode(antlr::nullAST) : _t;
 	RefDNode e_AST_in = RefDNode(antlr::nullAST);
 	e_AST = astFactory->create(antlr::RefAST(e));
-	antlr::ASTPair __currentAST197 = currentAST;
+	antlr::ASTPair __currentAST196 = currentAST;
 	currentAST.root = currentAST.child;
 	currentAST.child = RefDNode(antlr::nullAST);
 	match(antlr::RefAST(_t),EXPR);
@@ -6260,8 +6274,8 @@
 	expr(_t);
 	_t = _retTree;
 	ex_AST = returnAST;
-	currentAST = __currentAST197;
-	_t = __t197;
+	currentAST = __currentAST196;
+	_t = __t196;
 	_t = _t->getNextSibling();
 	brace_expr_AST = RefDNode(currentAST.root);
 	
@@ -6288,12 +6302,12 @@
 	RefDNode ex_AST = RefDNode(antlr::nullAST);
 	RefDNode ex = RefDNode(antlr::nullAST);
 	
-	RefDNode __t199 = _t;
+	RefDNode __t198 = _t;
 	RefDNode tmp76_AST = RefDNode(antlr::nullAST);
 	RefDNode tmp76_AST_in = RefDNode(antlr::nullAST);
 	tmp76_AST = astFactory->create(antlr::RefAST(_t));
 	tmp76_AST_in = _t;
-	antlr::ASTPair __currentAST199 = currentAST;
+	antlr::ASTPair __currentAST198 = currentAST;
 	currentAST.root = currentAST.child;
 	currentAST.child = RefDNode(antlr::nullAST);
 	match(antlr::RefAST(_t),EXPR);
@@ -6302,8 +6316,8 @@
 	expr(_t);
 	_t = _retTree;
 	ex_AST = returnAST;
-	currentAST = __currentAST199;
-	_t = __t199;
+	currentAST = __currentAST198;
+	_t = __t198;
 	_t = _t->getNextSibling();
 	unbrace_expr_AST = RefDNode(currentAST.root);
 	
@@ -6375,13 +6389,13 @@
 	switch ( _t->getType()) {
 	case ARRAYEXPR:
 	{
-		RefDNode __t202 = _t;
+		RefDNode __t201 = _t;
 		RefDNode tmp77_AST = RefDNode(antlr::nullAST);
 		RefDNode tmp77_AST_in = RefDNode(antlr::nullAST);
 		tmp77_AST = astFactory->create(antlr::RefAST(_t));
 		tmp77_AST_in = _t;
 		astFactory->addASTChild(currentAST, antlr::RefAST(tmp77_AST));
-		antlr::ASTPair __currentAST202 = currentAST;
+		antlr::ASTPair __currentAST201 = currentAST;
 		currentAST.root = currentAST.child;
 		currentAST.child = RefDNode(antlr::nullAST);
 		match(antlr::RefAST(_t),ARRAYEXPR);
@@ -6392,8 +6406,8 @@
 		arrayindex_list(_t);
 		_t = _retTree;
 		astFactory->addASTChild(currentAST, antlr::RefAST(returnAST));
-		currentAST = __currentAST202;
-		_t = __t202;
+		currentAST = __currentAST201;
+		_t = __t201;
 		_t = _t->getNextSibling();
 		array_expr_AST = RefDNode(currentAST.root);
 		break;
@@ -6470,13 +6484,13 @@
 	switch ( _t->getType()) {
 	case ARRAYEXPR:
 	{
-		RefDNode __t205 = _t;
+		RefDNode __t204 = _t;
 		RefDNode tmp78_AST = RefDNode(antlr::nullAST);
 		RefDNode tmp78_AST_in = RefDNode(antlr::nullAST);
 		tmp78_AST = astFactory->create(antlr::RefAST(_t));
 		tmp78_AST_in = _t;
 		astFactory->addASTChild(currentAST, antlr::RefAST(tmp78_AST));
-		antlr::ASTPair __currentAST205 = currentAST;
+		antlr::ASTPair __currentAST204 = currentAST;
 		currentAST.root = currentAST.child;
 		currentAST.child = RefDNode(antlr::nullAST);
 		match(antlr::RefAST(_t),ARRAYEXPR);
@@ -6487,8 +6501,8 @@
 		arrayindex_list(_t);
 		_t = _retTree;
 		astFactory->addASTChild(currentAST, antlr::RefAST(returnAST));
-		currentAST = __currentAST205;
-		_t = __t205;
+		currentAST = __currentAST204;
+		_t = __t204;
 		_t = _t->getNextSibling();
 		tag_array_expr_1st_AST = RefDNode(currentAST.root);
 		break;
@@ -6561,13 +6575,13 @@
 	switch ( _t->getType()) {
 	case ARRAYEXPR:
 	{
-		RefDNode __t208 = _t;
+		RefDNode __t207 = _t;
 		RefDNode tmp80_AST = RefDNode(antlr::nullAST);
 		RefDNode tmp80_AST_in = RefDNode(antlr::nullAST);
 		tmp80_AST = astFactory->create(antlr::RefAST(_t));
 		tmp80_AST_in = _t;
 		astFactory->addASTChild(currentAST, antlr::RefAST(tmp80_AST));
-		antlr::ASTPair __currentAST208 = currentAST;
+		antlr::ASTPair __currentAST207 = currentAST;
 		currentAST.root = currentAST.child;
 		currentAST.child = RefDNode(antlr::nullAST);
 		match(antlr::RefAST(_t),ARRAYEXPR);
@@ -6578,8 +6592,8 @@
 		arrayindex_list(_t);
 		_t = _retTree;
 		astFactory->addASTChild(currentAST, antlr::RefAST(returnAST));
-		currentAST = __currentAST208;
-		_t = __t208;
+		currentAST = __currentAST207;
+		_t = __t207;
 		_t = _t->getNextSibling();
 		tag_array_expr_AST = RefDNode(currentAST.root);
 		break;
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/GDLTreeParser.hpp cvs/gdl/src/GDLTreeParser.hpp
--- gdl-0.9rc2/src/GDLTreeParser.hpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/GDLTreeParser.hpp	2009-01-26 09:43:54.000000000 -0700
@@ -145,13 +145,12 @@
 	public: void procedure_def(RefDNode _t);
 	public: void function_def(RefDNode _t);
 	public: void forward_function(RefDNode _t);
-	public: void main_program(RefDNode _t);
+	public: void common_block(RefDNode _t);
+	public: void statement_list(RefDNode _t);
 	public: void interactive(RefDNode _t);
 	public: void statement(RefDNode _t);
-	public: void statement_list(RefDNode _t);
 	public: void parameter_declaration(RefDNode _t);
 	public: void keyword_declaration(RefDNode _t);
-	public: void common_block(RefDNode _t);
 	public: void caseswitch_body(RefDNode _t);
 	public: void expr(RefDNode _t);
 	public: void switch_statement(RefDNode _t);
Only in gdl-0.9rc2/src: KEYWORDS
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/prognode.cpp cvs/gdl/src/prognode.cpp
--- gdl-0.9rc2/src/prognode.cpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/prognode.cpp	2009-01-26 09:43:54.000000000 -0700
@@ -23,8 +23,25 @@
 
 #include "dinterpreter.hpp"
 
+#include "objects.hpp"
+
 using namespace std;
 
+bool ProgNode::ConstantNode()
+  {
+    if( this->getType() == GDLTokenTypes::SYSVAR)
+      {
+	// note: this works, because system variables are never 
+	//       passed by reference
+       SizeT rdOnlySize = sysVarRdOnlyList.size();
+         for( SizeT i=0; i<rdOnlySize; ++i)
+                  if( sysVarRdOnlyList[ i] == this->var)
+		    return true;
+      }
+
+    return this->getType() == GDLTokenTypes::CONSTANT;
+  }
+
 BaseGDL* ARRAYDEFNode::Eval()
 {
   // GDLInterpreter::
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/prognode.hpp cvs/gdl/src/prognode.hpp
--- gdl-0.9rc2/src/prognode.hpp	2009-01-20 12:33:54.000000000 -0700
+++ cvs/gdl/src/prognode.hpp	2009-01-26 09:43:54.000000000 -0700
@@ -91,10 +91,7 @@
   virtual BaseGDL* EvalNC(); // non-copy
   virtual void     Run();
 
-  bool ConstantNode()
-  {
-    return this->getType() == GDLTokenTypes::CONSTANT;
-  }
+  bool ConstantNode();
 
   ProgNodeP getFirstChild() const
   {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Apr 2008 04:22:34 -0000	1.10
+++ .cvsignore	26 Jan 2009 16:52:04 -0000	1.11
@@ -1 +1 @@
-gdl-0.9rc1.tar.gz
+gdl-0.9rc2.tar.gz

gdl-0.9rc1-gcc43.patch:

Index: gdl-0.9rc1-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl-0.9rc1-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdl-0.9rc1-gcc43.patch	6 Sep 2008 04:17:49 -0000	1.1
+++ gdl-0.9rc1-gcc43.patch	26 Jan 2009 16:52:04 -0000	1.2
@@ -8,17 +8,6 @@
  #include <iostream>
  #include <stdio.h>
  
---- gdl-0.9rc1/src/antlr/CharScanner.hpp.gcc43	2008-09-05 22:06:20.000000000 -0600
-+++ gdl-0.9rc1/src/antlr/CharScanner.hpp	2008-09-05 22:06:20.000000000 -0600
-@@ -14,6 +14,8 @@
- #include <cstring>
- #include <cstdlib>
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <map>
- 
- #ifdef HAS_NOT_CCTYPE_H
 --- gdl-0.9rc1/src/antlr/Parser.cpp.gcc43	2008-04-03 16:09:26.000000000 -0600
 +++ gdl-0.9rc1/src/antlr/Parser.cpp	2008-09-05 22:06:20.000000000 -0600
 @@ -11,6 +11,7 @@


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gdl.spec	1 Dec 2008 05:03:47 -0000	1.39
+++ gdl.spec	26 Jan 2009 16:52:04 -0000	1.40
@@ -1,15 +1,15 @@
 Name:           gdl
 Version:        0.9
-Release:        0.rc1.4%{?dist}.1
+Release:        0.rc2.1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc1.tar.gz
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.gz
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch0:         gdl-0.9rc1-cvs.patch
+Patch0:         gdl-0.9rc2-cvs.patch
 Patch1:         gdl-0.9pre5-ppc64.patch
 Patch2:         gdl-0.9rc1-gcc43.patch
 Patch3:         gdl-0.9rc1-magick.patch
@@ -32,7 +32,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1 -b .cvs
 %patch1 -p1 -b .ppc64
 %patch2 -p1 -b .gcc43
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc2.1
+- Update to 0.9rc2 based cvs
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9-0.rc1.4.1
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Apr 2008 04:22:34 -0000	1.10
+++ sources	26 Jan 2009 16:52:04 -0000	1.11
@@ -1 +1 @@
-9cf6c3603b71988761d5d2c4551ecb10  gdl-0.9rc1.tar.gz
+4ae52c19cdd6f4684b8e0b6ce8a9902c  gdl-0.9rc2.tar.gz


--- gdl-0.9rc1-cvs.patch DELETED ---




More information about the fedora-extras-commits mailing list