two more for 1.2.9

--Apple-Mail-1-1059396821
Content-Disposition: attachment;
	filename=ivtools-100225-johnston-038
Content-Type: application/octet-stream; x-unix-mode=0644;
	name="ivtools-100225-johnston-038"
Content-Transfer-Encoding: 7bit

Patch:    ivtools-100225-johnston-038
For:      ivtools-1.2
Author:   [email protected]
Subject:  
Requires: 

This is an intermediate patch to ivtools-1.2.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

Index: top_ivtools/CHANGES
diff -c top_ivtools/CHANGES:1.13 top_ivtools/CHANGES:1.14
*** top_ivtools/CHANGES:1.13	Tue Feb 23 11:03:57 2010
--- ./CHANGES	Thu Feb 25 12:22:50 2010
***************
*** 9,14 ****
--- 9,18 ----
  
  - port to 64 bit Fedora
  
+ - fix problem with negative numbers in attribute editor
+ 
+ - make File/Save and File/Revert always work regardless of modified flag
+ 
  Nov. 21st, 2009  ivtools-1.2.8
  
  - significant work on keeping up with gcc and libstdc++.  A wrapper
*** /dev/null	 Thu Feb 25 12:22:55 PST 2010
--- patches/ivtools-100225-johnston-038
*************** patches/ivtools-100225-johnston-038
*** 0 ****
--- 1 ----
+ ivtools-100225-johnston-038

--Apple-Mail-1-1059396821
Content-Disposition: attachment;
	filename=ivtools-100225-johnston-037
Content-Type: application/octet-stream; x-unix-mode=0644;
	name="ivtools-100225-johnston-037"
Content-Transfer-Encoding: 7bit

Patch:    ivtools-100225-johnston-037
For:      ivtools-1.2
Author:   [email protected]
Subject:  
Requires: 

This is an intermediate patch to ivtools-1.2.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

Index: AttrGlyph/attredit.c
diff -c AttrGlyph/attredit.c:1.2 AttrGlyph/attredit.c:1.3
*** AttrGlyph/attredit.c:1.2	Fri May 16 10:47:50 2008
--- src/AttrGlyph/attredit.c	Thu Feb 25 12:21:18 2010
***************
*** 42,47 ****
--- 42,48 ----
  #include <IVGlyph/textedit.h>
  #include <IVGlyph/textview.h>
  
+ #include <ctype.h>
  #include <strstream>
  #include <string.h>
  #if __GNUC__==2 && __GNUC_MINOR__<=7
***************
*** 94,100 ****
      if (txt->length() > 0) {
  	char* buf = new char[strlen(_valfe->text()->string())+2];
  	sprintf(buf, "%s\n", _valfe->text()->string());
! 	_list->add_attr(txt->string(), ParamList::lexscan()->get_attr(buf, strlen(buf)));
  	update_text(true);
      }
  }
--- 95,106 ----
      if (txt->length() > 0) {
  	char* buf = new char[strlen(_valfe->text()->string())+2];
  	sprintf(buf, "%s\n", _valfe->text()->string());
! 	while(isspace(*buf) && *buf!='\0') buf++;
! 	int negate = *buf=='-';
! 	int skip = negate || *buf=='+';
! 	AttributeValue* av = ParamList::lexscan()->get_attr(buf+skip, strlen(buf+skip));
! 	if(negate) av->negate();
! 	_list->add_attr(txt->string(), av);
  	update_text(true);
      }
  }
Index: Attribute/lexscan.c
diff -c Attribute/lexscan.c:1.2 Attribute/lexscan.c:1.3
*** Attribute/lexscan.c:1.2	Tue Feb 23 11:03:59 2010
--- src/Attribute/lexscan.c	Thu Feb 25 12:21:14 2010
***************
*** 125,134 ****
--- 125,144 ----
  
  const int LexScan::get_next_value(AttributeValue* attrval, char delim)
  {
+     static int minus_symid = symbol_add("-");
+     static int plus_symid = symbol_add("+");
      attr_value token;
      unsigned int toktype;
+     int negate = 0;
      do {
          token = get_next_token(toktype);
+ 	if(toktype == TOK_OPERATOR && token.symval.symid==minus_symid) {
+ 	  negate = 1;
+ 	  token = get_next_token(toktype);
+ 	}
+ 	else if(toktype == TOK_OPERATOR && token.symval.symid==plus_symid) {
+ 	  token = get_next_token(toktype);
+ 	}
      } while(toktype == TOK_OPERATOR && *symbol_pntr(token.symval.symid)==delim);
      if (toktype==TOK_EOF)
        return 0;
***************
*** 136,141 ****
--- 146,152 ----
        return 2;
      else {
        AttributeValue tokval((AttributeValue::ValueType)toktype, token);
+       if (negate) tokval.negate();
        *attrval = tokval;
        return 1;
      }
Index: OverlayUnidraw/ovcmds.c
diff -c OverlayUnidraw/ovcmds.c:1.3 OverlayUnidraw/ovcmds.c:1.4
*** OverlayUnidraw/ovcmds.c:1.3	Wed Aug 26 09:21:38 2009
--- src/OverlayUnidraw/ovcmds.c	Thu Feb 25 12:21:19 2010
***************
*** 218,224 ****
      const char* name = catalog->GetName(comp);
      ModifStatusVar* mv = (ModifStatusVar*) ed->GetState("ModifStatusVar");
  
!     if (name != nil && (mv == nil || mv->GetModifStatus())) {
          char buf[CHARBUFSIZE];
          strcpy(buf, name);
  
--- 218,224 ----
      const char* name = catalog->GetName(comp);
      ModifStatusVar* mv = (ModifStatusVar*) ed->GetState("ModifStatusVar");
  
!     if (name != nil /* && (mv == nil || mv->GetModifStatus())*/) {
          char buf[CHARBUFSIZE];
          strcpy(buf, name);
  
***************
*** 424,430 ****
      if (name == nil) {
          OvSaveCompAsCmd saveCompAs(ed, chooser_);
          saveCompAs.Execute();
!     } else if (modifVar == nil || modifVar->GetModifStatus()) {
          Catalog* catalog = unidraw->GetCatalog();
  
          if (catalog->Retrieve(name, comp_) && catalog->Save(comp_, name)) {
--- 424,430 ----
      if (name == nil) {
          OvSaveCompAsCmd saveCompAs(ed, chooser_);
          saveCompAs.Execute();
!     } else if ( 1 /*modifVar == nil || modifVar->GetModifStatus()*/) {
          Catalog* catalog = unidraw->GetCatalog();
  
          if (catalog->Retrieve(name, comp_) && catalog->Save(comp_, name)) {
*** /dev/null	 Thu Feb 25 12:21:23 PST 2010
--- patches/ivtools-100225-johnston-037
*************** patches/ivtools-100225-johnston-037
*** 0 ****
--- 1 ----
+ ivtools-100225-johnston-037

--Apple-Mail-1-1059396821
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--Apple-Mail-1-1059396821
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Ivtools-patch mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ivtools-patch

--Apple-Mail-1-1059396821--