From 81e7814887a70e046e5e474ff877b7239fc043a5 Mon Sep 17 00:00:00 2001
From: Tom Igoe <t.igoe@arduino.cc>
Date: Tue, 27 Jul 2010 22:59:18 +0000
Subject: [PATCH] added more String examples

---
 .../StringAdditionOperator.pde                |  5 +-
 .../StringAdditionOperator/data/readme.txt    | 41 -----------
 .../StringAppendOperator.pde                  |  2 -
 .../StringCaseChanges/StringCaseChanges.pde   | 45 ++++++++++++
 .../StringCharacters/StringCharacters.pde     | 56 +++++++++++++++
 .../StringComparisonOperators.pde             |  4 +-
 .../StringConstructors/StringConstructors.pde |  3 -
 .../8.Strings/StringIndexOf/StringIndexOf.pde | 72 +++++++++++++++++++
 .../StringLengthTrim/StringLengthTrim.pde     | 52 ++++++++++++++
 .../8.Strings/StringReplace/StringReplace.pde | 52 ++++++++++++++
 .../StringStartsWithEndsWith.pde              | 62 ++++++++++++++++
 .../StringSubstring/StringSubstring.pde       | 50 +++++++++++++
 hardware/arduino/cores/arduino/WString.h      |  2 +-
 13 files changed, 392 insertions(+), 54 deletions(-)
 delete mode 100644 build/shared/examples/8.Strings/StringAdditionOperator/data/readme.txt
 create mode 100644 build/shared/examples/8.Strings/StringCaseChanges/StringCaseChanges.pde
 create mode 100644 build/shared/examples/8.Strings/StringCharacters/StringCharacters.pde
 create mode 100644 build/shared/examples/8.Strings/StringIndexOf/StringIndexOf.pde
 create mode 100644 build/shared/examples/8.Strings/StringLengthTrim/StringLengthTrim.pde
 create mode 100644 build/shared/examples/8.Strings/StringReplace/StringReplace.pde
 create mode 100644 build/shared/examples/8.Strings/StringStartsWithEndsWith/StringStartsWithEndsWith.pde
 create mode 100644 build/shared/examples/8.Strings/StringSubstring/StringSubstring.pde

diff --git a/build/shared/examples/8.Strings/StringAdditionOperator/StringAdditionOperator.pde b/build/shared/examples/8.Strings/StringAdditionOperator/StringAdditionOperator.pde
index a4eaa2e7f..10a641018 100644
--- a/build/shared/examples/8.Strings/StringAdditionOperator/StringAdditionOperator.pde
+++ b/build/shared/examples/8.Strings/StringAdditionOperator/StringAdditionOperator.pde
@@ -4,13 +4,10 @@
  Examples of how to add strings together
  You can also add several different data types to string, as shown here:
  
- The circuit:  No external hardware needed.
- 
  created 27 July 2010
  by Tom Igoe
  
- This example code is in the public domain.
- 
+ This example code is in the public domain. 
  */
 
 // declare three strings:
diff --git a/build/shared/examples/8.Strings/StringAdditionOperator/data/readme.txt b/build/shared/examples/8.Strings/StringAdditionOperator/data/readme.txt
deleted file mode 100644
index d82c3f753..000000000
--- a/build/shared/examples/8.Strings/StringAdditionOperator/data/readme.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Arduino is an open-source physical computing platform based on a simple i/o
-board and a development environment that implements the Processing/Wiring
-language. Arduino can be used to develop stand-alone interactive objects or
-can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
-The boards can be assembled by hand or purchased preassembled; the open-source
-IDE can be downloaded for free.
-
-For more information, see the website at: http://www.arduino.cc/
-or the forums at: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl
-
-To report a bug or a make a suggestions, go to:
-[hardware] http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?board=hwbugs
-[software] http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?board=swbugs
-
-INSTALLATION
-Detailed instructions are in reference/Guide_Windows.html and
-reference/Guide_MacOSX.html.  For Linux, see the Arduino playground:
-http://www.arduino.cc/playground/Learning/Linux
-
-If you are using a USB Arduino, you will need to install the drivers for the
-FTDI chip on the board. These can be found in the drivers/ directory.
-
-* On Windows, plug in the Arduino board and point the Windows Add Hardware
-  wizard to the drivers/FTDI USB Drivers sub-directory of the Arduino
-  application directory.
-
-* On the Mac, install the FTDIUSBSerialDriver_10_4_10_5_10_6.mpkg package.
-  
-* On Linux, drivers are included in kernel versions 2.4.20 or greater.
-
-CREDITS
-Arduino is an open source project, supported by many.
-
-The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
-Gianluca Martino, and David A. Mellis.
-
-Arduino uses the GNU avr-gcc toolchain, avrdude, avr-libc, and code from
-Processing and Wiring.
-
-Icon Design and Artwork created by Thomas Glaser (envis precisely).
-
diff --git a/build/shared/examples/8.Strings/StringAppendOperator/StringAppendOperator.pde b/build/shared/examples/8.Strings/StringAppendOperator/StringAppendOperator.pde
index ba01c2e7e..2f22b1f51 100644
--- a/build/shared/examples/8.Strings/StringAppendOperator/StringAppendOperator.pde
+++ b/build/shared/examples/8.Strings/StringAppendOperator/StringAppendOperator.pde
@@ -2,13 +2,11 @@
   Appending to Strings using the += operator and concat()
  
  Examples of how to append different data types to strings
- The circuit:  No external hardware needed.
  
  created 27 July 2010
  by Tom Igoe
  
  This example code is in the public domain.
- 
  */
 String stringOne, stringTwo;
 
diff --git a/build/shared/examples/8.Strings/StringCaseChanges/StringCaseChanges.pde b/build/shared/examples/8.Strings/StringCaseChanges/StringCaseChanges.pde
new file mode 100644
index 000000000..42316e300
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringCaseChanges/StringCaseChanges.pde
@@ -0,0 +1,45 @@
+/*
+  String Case changes
+ 
+ Examples of how to change the case of a string
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain.
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString  case changes:");
+}
+
+void loop() {
+  // toUpperCase() changes all letters to upper case:
+  String stringOne = "<html><head><body>";
+  Serial.println(stringOne.toUpperCase());
+  
+ // toLowerCase() changes all letters to lower case:  
+  String stringTwo = "</BODY></HTML>";
+  Serial.println(stringTwo.toLowerCase());
+  
+  // do nothing while true:
+  while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/shared/examples/8.Strings/StringCharacters/StringCharacters.pde b/build/shared/examples/8.Strings/StringCharacters/StringCharacters.pde
new file mode 100644
index 000000000..ff29aea09
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringCharacters/StringCharacters.pde
@@ -0,0 +1,56 @@
+/*
+  String charAt() and setCharAt()
+ 
+ Examples of how to get and set characters of a String
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain.
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString  charAt() and setCharAt():");
+}
+
+void loop() {
+  // make a string to report a sensor reading:
+  String reportString = "SensorReading: 456";
+  Serial.println(reportString);
+  
+  // the reading's most significant digit is at position 15 in the reportString:
+  String mostSignificantDigit = reportString.charAt(15);
+  Serial.println("Most significant digit of the sensor reading is: " + mostSignificantDigit);
+
+// add blank space:
+  Serial.println();
+  
+  // you can alo set the character of a string. Change the : to a = character
+  reportString.setCharAt(13, '='); 
+  Serial.println(reportString);
+
+  // do nothing while true:
+  while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/shared/examples/8.Strings/StringComparisonOperators/StringComparisonOperators.pde b/build/shared/examples/8.Strings/StringComparisonOperators/StringComparisonOperators.pde
index 425262f4b..0e6bb748b 100644
--- a/build/shared/examples/8.Strings/StringComparisonOperators/StringComparisonOperators.pde
+++ b/build/shared/examples/8.Strings/StringComparisonOperators/StringComparisonOperators.pde
@@ -3,14 +3,12 @@
  
  Examples of how to compare strings using the comparison operators
  
- The circuit:  No external hardware needed.
- 
  created 27 July 2010
  by Tom Igoe
  
  This example code is in the public domain.
- 
  */
+ 
 String stringOne, stringTwo;
 
 void setup() {
diff --git a/build/shared/examples/8.Strings/StringConstructors/StringConstructors.pde b/build/shared/examples/8.Strings/StringConstructors/StringConstructors.pde
index a63e461af..cff1419f7 100644
--- a/build/shared/examples/8.Strings/StringConstructors/StringConstructors.pde
+++ b/build/shared/examples/8.Strings/StringConstructors/StringConstructors.pde
@@ -3,13 +3,10 @@
  
  Examples of how  to create strings from other data types
  
- The circuit:  No external hardware needed.
- 
  created 27 July 2010
  by Tom Igoe
  
  This example code is in the public domain.
- 
  */
 
 void setup() {
diff --git a/build/shared/examples/8.Strings/StringIndexOf/StringIndexOf.pde b/build/shared/examples/8.Strings/StringIndexOf/StringIndexOf.pde
new file mode 100644
index 000000000..218d6552f
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringIndexOf/StringIndexOf.pde
@@ -0,0 +1,72 @@
+/*
+  String indexOf() and lastIndexOf() functions
+ 
+ Examples of how to evaluate, look for, and replace characters in a String
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain. 
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString indexOf() and lastIndexOf()  functions:");
+
+}
+
+void loop() {
+ // indexOf() returns the position (i.e. index) of a particular character
+  // in a string. For example, if you were parsing HTML tags, you could use it:
+  String stringOne = "<HTML><HEAD><BODY>";
+  int firstClosingBracket = stringOne.indexOf('>');
+  Serial.println("The index of > in the string " + stringOne + " is " + firstClosingBracket);
+
+  stringOne = "<HTML><HEAD><BODY>";
+  int secondOpeningBracket = firstClosingBracket + 1;
+  int secondClosingBracket = stringOne.indexOf('>', secondOpeningBracket );
+  Serial.println("The index of  the second > in the string " + stringOne + " is " + secondClosingBracket);
+
+  // you can also use indexOf() to search for Strings:
+  stringOne = "<HTML><HEAD><BODY>";
+  int bodyTag = stringOne.indexOf("<BODY>");
+  Serial.println("The index of the body tag in the string " + stringOne + " is " + bodyTag);
+
+  stringOne = "<UL><LI>item<LI>item<LI>item</UL>";
+  int firstListItem = stringOne.indexOf("<LI>");
+  int secondListItem = stringOne.indexOf("item", firstListItem + 1 );
+  Serial.println("The index of the second list item in the string " + stringOne + " is " + secondClosingBracket);
+
+  // lastIndexOf() gives you the last occurrence of a character or string:
+  int lastOpeningBracket = stringOne.lastIndexOf('<');
+  Serial.println("The index of the last < in the string " + stringOne + " is " + lastOpeningBracket);
+
+  int lastListItem  = stringOne.lastIndexOf("<LI>");
+  Serial.println("The index of the last list item in the string " + stringOne + " is " + lastListItem);
+
+
+// lastIndexOf() can also search for a string:
+   stringOne = "<p>Lorem ipsum dolor sit amet</p><p>Ipsem</p><p>Quod</p>";
+  int lastParagraph = stringOne.lastIndexOf("<p");
+  int penultimateParagraph = stringOne.lastIndexOf("<p", lastParagraph - 1);
+  Serial.println("The index of the second last paragraph tag " + stringOne + " is " + penultimateParagraph);
+
+// do nothing while true:
+ while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/shared/examples/8.Strings/StringLengthTrim/StringLengthTrim.pde b/build/shared/examples/8.Strings/StringLengthTrim/StringLengthTrim.pde
new file mode 100644
index 000000000..48bfb9d76
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringLengthTrim/StringLengthTrim.pde
@@ -0,0 +1,52 @@
+/*
+  String length() and trim()
+ 
+ Examples of how to use length() and trim() in a String
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain.
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString  length() and trim():");
+}
+
+void loop() {
+  // here's a String with empty spaces at the end (called white space):
+  String stringOne = "Hello!       ";
+  Serial.print(stringOne);
+  Serial.print("<--- end of string. Length: ");
+  Serial.println(stringOne.length());
+
+  // trim the white space off the string:
+  stringOne = stringOne.trim();
+  Serial.print(stringOne);
+  Serial.print("<--- end of trimmed string. Length: ");
+  Serial.println(stringOne.length());
+
+  // do nothing while true:
+  while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/shared/examples/8.Strings/StringReplace/StringReplace.pde b/build/shared/examples/8.Strings/StringReplace/StringReplace.pde
new file mode 100644
index 000000000..da60cfd89
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringReplace/StringReplace.pde
@@ -0,0 +1,52 @@
+/*
+  String replace()
+ 
+ Examples of how to replace characters or substrings of a string
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain. 
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString  replace:");
+}
+
+void loop() {
+  String stringOne = "<html><head><body>";
+  Serial.println(stringOne);
+  // replace() changes all instances of one substring with another:
+  String stringTwo = stringOne.replace("<", "</");
+  Serial.println(stringTwo);
+
+  // you can also use replace() on single characters:
+  String normalString = "bookkeeper";
+  Serial.println("normal: " + normalString);
+  String leetString = normalString.replace('o', '0');
+  leetString = leetString.replace('e', '3');
+  Serial.println("l33tspeak: " + leetString);
+
+  // do nothing while true:
+  while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/shared/examples/8.Strings/StringStartsWithEndsWith/StringStartsWithEndsWith.pde b/build/shared/examples/8.Strings/StringStartsWithEndsWith/StringStartsWithEndsWith.pde
new file mode 100644
index 000000000..1111333b6
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringStartsWithEndsWith/StringStartsWithEndsWith.pde
@@ -0,0 +1,62 @@
+/*
+  String startWith() and endsWith()
+ 
+ Examples of how to use startsWith() and endsWith() in a String
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain.
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString startsWith() and endsWith():");
+
+}
+
+void loop() {
+// startsWith() checks to see if a String starts with a particular substring:
+    String stringOne = "HTTP/1.1 200 OK";
+    Serial.println(stringOne);
+  if (stringOne.startsWith("HTTP/1.1")) {
+    Serial.println("Server's using http version 1.1"); 
+  } 
+  
+  // you can also look for startsWith() at an offset position in the string:
+     stringOne = "HTTP/1.1 200 OK";
+  if (stringOne.startsWith("200 OK", 9)) {
+    Serial.println("Got an OK from the server"); 
+  } 
+  
+  // endsWith() checks to see if a String ends with a particular character:
+  String sensorReading = "sensor = ";
+  sensorReading += analogRead(0);
+  Serial.print (sensorReading);
+  if (sensorReading.endsWith(0)) {
+    Serial.println(". This reading is divisible by ten"); 
+  } 
+  else {
+    Serial.println(". This reading is not divisible by ten"); 
+
+  }
+
+// do nothing while true:
+ while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/shared/examples/8.Strings/StringSubstring/StringSubstring.pde b/build/shared/examples/8.Strings/StringSubstring/StringSubstring.pde
new file mode 100644
index 000000000..b383c1be5
--- /dev/null
+++ b/build/shared/examples/8.Strings/StringSubstring/StringSubstring.pde
@@ -0,0 +1,50 @@
+/*
+  String substring()
+ 
+ Examples of how to use substring in a String
+ 
+ created 27 July 2010
+ by Tom Igoe
+ 
+ This example code is in the public domain.
+ */
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println("\n\nString  substring():");
+}
+
+void loop() {
+  // startsWith() checks to see if a String starts with a particular substring:
+  String stringOne = "Content-Type: text/html";
+  Serial.println(stringOne);
+  
+  // substring(index) looks for the substring from the index position to the end:
+  if (stringOne.substring(19) == "html") {
+    Serial.println("It's an html file"); 
+  } 
+  // you can also look for a substring in the middle of a string:
+  if (stringOne.substring(14,18) == "text") {
+    Serial.println("It's a text-based file"); 
+  } 
+
+  // do nothing while true:
+  while(true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/arduino/cores/arduino/WString.h
index 5693e1133..b4b6a38f1 100644
--- a/hardware/arduino/cores/arduino/WString.h
+++ b/hardware/arduino/cores/arduino/WString.h
@@ -37,7 +37,7 @@ class String
     String( const unsigned int, const int base=10 );
     String( const long, const int base=10 );
     String( const unsigned long, const int base=10 );
-    ~String() { free(_buffer); }
+    ~String() { free(_buffer); _length = _capacity = 0;}     //added _length = _capacity = 0;
 
     // operators
     const String & operator = ( const String &rhs );