diff --git a/servers/rest_server/includes/RESTServer.inc b/servers/rest_server/includes/RESTServer.inc index 63528bc..2d0c66b 100755 --- a/servers/rest_server/includes/RESTServer.inc +++ b/servers/rest_server/includes/RESTServer.inc @@ -461,7 +461,7 @@ class RESTServer { public static function parseYAML($handle) { module_load_include('php', 'rest_server', 'lib/spyc'); - return Spyc::YAMLLoad(self::contentFromStream($handle)); + return Spyc::YAMLLoadString(self::contentFromStream($handle)); } private function responseFormatters($format=NULL) { @@ -567,4 +567,4 @@ class RESTServer { return $action; } } -} \ No newline at end of file +} diff --git a/servers/rest_server/lib/spyc.php b/servers/rest_server/lib/spyc.php index f9a818d..e19d562 100644 --- a/servers/rest_server/lib/spyc.php +++ b/servers/rest_server/lib/spyc.php @@ -1,51 +1,100 @@ - * $parser = new Spyc; - * $array = $parser->load($file); - * - * @version 0.3 - * @author Chris Wanstrath - * @author Vlad Andersen - * @link http://spyc.sourceforge.net/ - * @copyright Copyright 2005-2006 Chris Wanstrath - * @license - * GPLv2. The original library is licensed under the MIT license. - * I would encourage anyone who wants to contribute to the spyc project - * to contact the maintainers over at source forge. All in the spirit - * of open source and sharing. - * /Hugo Wetterberg - * @package Spyc - */ + * Spyc -- A Simple PHP YAML Class + * @version 0.5 + * @author Vlad Andersen + * @author Chris Wanstrath + * @link http://code.google.com/p/spyc/ + * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen + * @license http://www.opensource.org/licenses/mit-license.php MIT License + * @package Spyc + */ + +if (!function_exists('spyc_load')) { + /** + * Parses YAML to array. + * @param string $string YAML string. + * @return array + */ + function spyc_load ($string) { + return Spyc::YAMLLoadString($string); + } +} + +if (!function_exists('spyc_load_file')) { + /** + * Parses YAML to array. + * @param string $file Path to YAML file. + * @return array + */ + function spyc_load_file ($file) { + return Spyc::YAMLLoad($file); + } +} + +/** + * The Simple PHP YAML Class. + * + * This class can be used to read a YAML file and convert its contents + * into a PHP array. It currently supports a very limited subsection of + * the YAML spec. + * + * Usage: + * + * $Spyc = new Spyc; + * $array = $Spyc->load($file); + * + * or: + * + * $array = Spyc::YAMLLoad($file); + * + * or: + * + * $array = spyc_load_file($file); + * + * @package Spyc + */ class Spyc { + // SETTINGS + + const REMPTY = "\0\0\0\0\0"; + + /** + * Setting this to true will force YAMLDump to enclose any string value in + * quotes. False by default. + * + * @var bool + */ + public $setting_dump_force_quotes = false; + + /** + * Setting this to true will forse YAMLLoad to use syck_load function when + * possible. False by default. + * @var bool + */ + public $setting_use_syck_is_possible = false; + + + /**#@+ * @access private * @var mixed */ - private $_haveRefs; - private $_allNodes; - private $_allParent; - private $_lastIndent; - private $_lastNode; - private $_inBlock; - private $_isInline; private $_dumpIndent; private $_dumpWordWrap; private $_containsGroupAnchor = false; private $_containsGroupAlias = false; private $path; private $result; - private $LiteralBlockMarkers = array ('>', '|'); private $LiteralPlaceHolder = '___YAML_Literal_Block___'; private $SavedGroups = array(); + private $indent; + /** + * Path modifier that should be applied after adding current element. + * @var array + */ + private $delayedPath = array(); /**#@+ * @access public @@ -53,6 +102,24 @@ class Spyc { */ public $_nodeId; +/** + * Load a valid YAML string to Spyc. + * @param string $input + * @return array + */ + public function load ($input) { + return $this->__loadString($input); + } + + /** + * Load a valid YAML file to Spyc. + * @param string $file + * @return array + */ + public function loadFile ($file) { + return $this->__load($file); + } + /** * Load YAML into a PHP array statically * @@ -70,13 +137,13 @@ class Spyc { */ public static function YAMLLoad($input) { $Spyc = new Spyc; - return $Spyc->load($input); + return $Spyc->__load($input); } /** * Load a string of YAML into a PHP array statically * - * The load method, when supplied with a YAML string, will do its best + * The load method, when supplied with a YAML string, will do its best * to convert YAML in a string into a PHP array. Pretty simple. * * Note: use this function if you don't want files from the file system @@ -94,7 +161,7 @@ class Spyc { */ public static function YAMLLoadString($input) { $Spyc = new Spyc; - return $Spyc->loadString($input); + return $Spyc->__loadString($input); } /** @@ -164,8 +231,14 @@ class Spyc { $string = "---\n"; // Start at the base of the array and move through it. - foreach ($array as $key => $value) { - $string .= $this->_yamlize($key,$value,0); + if ($array) { + $array = (array)$array; + $previous_key = -1; + foreach ($array as $key => $value) { + if (!isset($first_key)) $first_key = $key; + $string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array); + $previous_key = $key; + } } return $string; } @@ -178,22 +251,20 @@ class Spyc { * @param $value The value of the item * @param $indent The indent of the current node */ - private function _yamlize($key,$value,$indent) { - if (is_object($value)) { - $value = get_object_vars($value); - } - + private function _yamlize($key,$value,$indent, $previous_key = -1, $first_key = 0, $source_array = null) { if (is_array($value)) { + if (empty ($value)) + return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array); // It has children. What to do? // Make it the right kind of item - $string = $this->_dumpNode($key,NULL,$indent); + $string = $this->_dumpNode($key, self::REMPTY, $indent, $previous_key, $first_key, $source_array); // Add the indent $indent += $this->_dumpIndent; // Yamlize the array $string .= $this->_yamlizeArray($value,$indent); } elseif (!is_array($value)) { // It doesn't have children. Yip. - $string = $this->_dumpNode($key,$value,$indent); + $string = $this->_dumpNode($key, $value, $indent, $previous_key, $first_key, $source_array); } return $string; } @@ -208,8 +279,11 @@ class Spyc { private function _yamlizeArray($array,$indent) { if (is_array($array)) { $string = ''; + $previous_key = -1; foreach ($array as $key => $value) { - $string .= $this->_yamlize($key,$value,$indent); + if (!isset($first_key)) $first_key = $key; + $string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array); + $previous_key = $key; } return $string; } else { @@ -225,27 +299,43 @@ class Spyc { * @param $value The value of the item * @param $indent The indent of the current node */ - private function _dumpNode($key,$value,$indent) { + private function _dumpNode($key, $value, $indent, $previous_key = -1, $first_key = 0, $source_array = null) { // do some folding here, for blocks - if (strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false) { + if (is_string ($value) && ((strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false || + strpos($value,"*") !== false || strpos($value,"#") !== false || strpos($value,"<") !== false || strpos($value,">") !== false || strpos ($value, ' ') !== false || + strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || strpos($value,"&") !== false || strpos($value, "'") !== false || strpos($value, "!") === 0 || + substr ($value, -1, 1) == ':') + ) { $value = $this->_doLiteralBlock($value,$indent); } else { $value = $this->_doFolding($value,$indent); } + if ($value === array()) $value = '[ ]'; + if (in_array ($value, array ('true', 'TRUE', 'false', 'FALSE', 'y', 'Y', 'n', 'N', 'null', 'NULL'), true)) { + $value = $this->_doLiteralBlock($value,$indent); + } + if (trim ($value) != $value) + $value = $this->_doLiteralBlock($value,$indent); + if (is_bool($value)) { - $value = ($value) ? "true" : "false"; + $value = ($value) ? "true" : "false"; } + + if ($value === null) $value = 'null'; + if ($value === "'" . self::REMPTY . "'") $value = null; $spaces = str_repeat(' ',$indent); - if (is_int($key)) { + //if (is_int($key) && $key - 1 == $previous_key && $first_key===0) { + if (is_array ($source_array) && array_keys($source_array) === range(0, count($source_array) - 1)) { // It's a sequence $string = $spaces.'- '.$value."\n"; } else { + // if ($first_key===0) throw new Exception('Keys are all screwy. The first one was zero, now it\'s "'. $key .'"'); // It's mapped - if (strpos($key, ":") !== false) { $key = '"' . $key . '"'; } - $string = $spaces.$key.': '.$value."\n"; + if (strpos($key, ":") !== false || strpos($key, "#") !== false) { $key = '"' . $key . '"'; } + $string = rtrim ($spaces.$key.': '.$value)."\n"; } return $string; } @@ -258,12 +348,19 @@ class Spyc { * @param $indent int The value of the indent */ private function _doLiteralBlock($value,$indent) { + if ($value === "\n") return '\n'; + if (strpos($value, "\n") === false && strpos($value, "'") === false) { + return sprintf ("'%s'", $value); + } + if (strpos($value, "\n") === false && strpos($value, '"') === false) { + return sprintf ('"%s"', $value); + } $exploded = explode("\n",$value); $newValue = '|'; $indent += $this->_dumpIndent; $spaces = str_repeat(' ',$indent); foreach ($exploded as $line) { - $newValue .= "\n" . $spaces . trim($line); + $newValue .= "\n" . $spaces . ($line); } return $newValue; } @@ -276,60 +373,90 @@ class Spyc { */ private function _doFolding($value,$indent) { // Don't do anything if wordwrap is set to 0 - if ($this->_dumpWordWrap === 0) { - return $value; - } - if (strlen($value) > $this->_dumpWordWrap) { + if ($this->_dumpWordWrap !== 0 && is_string ($value) && strlen($value) > $this->_dumpWordWrap) { $indent += $this->_dumpIndent; $indent = str_repeat(' ',$indent); $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent"); $value = ">\n".$indent.$wrapped; + } else { + if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY) + $value = '"' . $value . '"'; } + + return $value; } -/* LOADING FUNCTIONS */ +// LOADING FUNCTIONS - private function load($input) { + private function __load($input) { $Source = $this->loadFromSource($input); return $this->loadWithSource($Source); } - private function loadString($input) { + private function __loadString($input) { $Source = $this->loadFromString($input); return $this->loadWithSource($Source); } private function loadWithSource($Source) { if (empty ($Source)) return array(); + if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) { + $array = syck_load (implode ('', $Source)); + return is_array($array) ? $array : array(); + } + $this->path = array(); $this->result = array(); - - for ($i = 0; $i < count($Source); $i++) { + $cnt = count($Source); + for ($i = 0; $i < $cnt; $i++) { $line = $Source[$i]; - - $lineIndent = $this->_getIndent($line); - $this->path = $this->getParentPathByIndent($lineIndent); - $line = $this->stripIndent($line, $lineIndent); - if ($this->isComment($line)) continue; - - if ($literalBlockStyle = $this->startsLiteralBlock($line)) { - $line = rtrim ($line, $literalBlockStyle . "\n"); + + $this->indent = strlen($line) - strlen(ltrim($line)); + $tempPath = $this->getParentPathByIndent($this->indent); + $line = self::stripIndent($line, $this->indent); + if (self::isComment($line)) continue; + if (self::isEmpty($line)) continue; + $this->path = $tempPath; + + $literalBlockStyle = self::startsLiteralBlock($line); + if ($literalBlockStyle) { + $line = rtrim ($line, $literalBlockStyle . " \n"); $literalBlock = ''; $line .= $this->LiteralPlaceHolder; - - while (++$i < count($Source) && $this->literalBlockContinues($Source[$i], $lineIndent)) { - $literalBlock = $this->addLiteralLine($literalBlock, $Source[$i], $literalBlockStyle); + $literal_block_indent = strlen($Source[$i+1]) - strlen(ltrim($Source[$i+1])); + while (++$i < $cnt && $this->literalBlockContinues($Source[$i], $this->indent)) { + $literalBlock = $this->addLiteralLine($literalBlock, $Source[$i], $literalBlockStyle, $literal_block_indent); } $i--; } + + while (++$i < $cnt && self::greedilyNeedNextLine($line)) { + $line = rtrim ($line, " \n\t\r") . ' ' . ltrim ($Source[$i], " \t"); + } + $i--; + + + + if (strpos ($line, '#')) { + if (strpos ($line, '"') === false && strpos ($line, "'") === false) + $line = preg_replace('/\s+#(.+)$/','',$line); + } + $lineArray = $this->_parseLine($line); + if ($literalBlockStyle) - $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock); + $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock); + + $this->addArray($lineArray, $this->indent); + + foreach ($this->delayedPath as $indent => $delayedPath) + $this->path[$indent] = $delayedPath; + + $this->delayedPath = array(); - $this->addArray($lineArray, $lineIndent); } return $this->result; } @@ -341,27 +468,15 @@ class Spyc { return $this->loadFromString($input); } - function loadFromString ($input) { + private function loadFromString ($input) { $lines = explode("\n",$input); foreach ($lines as $k => $_) { - $lines[$k] = trim ($_, "\r"); + $lines[$k] = rtrim ($_, "\r"); } return $lines; } /** - * Finds and returns the indentation of a YAML line - * @access private - * @return int - * @param string $line A line from the YAML file - */ - private function _getIndent($line) { - if (!preg_match('/^ +/',$line,$match)) return 0; - if (!empty($match[0])) return strlen ($match[0]); - return 0; - } - - /** * Parses YAML code and returns an array for a node * @access private * @return array @@ -371,9 +486,11 @@ class Spyc { if (!$line) return array(); $line = trim($line); if (!$line) return array(); + $array = array(); - if ($group = $this->nodeContainsGroup($line)) { + $group = $this->nodeContainsGroup($line); + if ($group) { $this->addGroup($line, $group); $line = $this->stripGroup ($line, $group); } @@ -388,9 +505,9 @@ class Spyc { return $this->returnArrayElement($line); if ($this->isPlainArray($line)) - return $this->returnPlainArray($line); - - + return $this->returnPlainArray($line); + + return $this->returnKeyValuePair($line); } @@ -402,46 +519,55 @@ class Spyc { * @return mixed */ private function _toType($value) { + if ($value === '') return null; + $first_character = $value[0]; + $last_character = substr($value, -1, 1); + $is_quoted = false; do { if (!$value) break; - if (substr($value, 0, 1) != '"' && substr($value, 0, 1) != "'") break; - if (substr($value, -1, 1) != '"' && substr($value, -1, 1) != "'") break; + if ($first_character != '"' && $first_character != "'") break; + if ($last_character != '"' && $last_character != "'") break; $is_quoted = true; } while (0); - if (!$is_quoted && strpos($value, ' #') !== false) + if ($is_quoted) + return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\'\'' => '\'', '\\\'' => '\'')); + + if (strpos($value, ' #') !== false && !$is_quoted) $value = preg_replace('/\s+#(.+)$/','',$value); - if (preg_match('/^("(.*)"|\'(.*)\')/',$value,$matches)) { - $value = (string)preg_replace('/(\'\'|\\\\\')/',"'",end($matches)); - $value = preg_replace('/\\\\"/','"',$value); - } elseif (preg_match('/^\\[(.+)\\]$/',$value,$matches)) { - // Inline Sequence + if (!$is_quoted) $value = str_replace('\n', "\n", $value); + if ($first_character == '[' && $last_character == ']') { // Take out strings sequences and mappings - $explode = $this->_inlineEscape($matches[1]); - + $innerValue = trim(substr ($value, 1, -1)); + if ($innerValue === '') return array(); + $explode = $this->_inlineEscape($innerValue); // Propagate value array $value = array(); foreach ($explode as $v) { $value[] = $this->_toType($v); } - } elseif (strpos($value,': ')!==false && !preg_match('/^{(.+)/',$value)) { - // It's a map + return $value; + } + + if (strpos($value,': ')!==false && $first_character != '{') { $array = explode(': ',$value); $key = trim($array[0]); array_shift($array); $value = trim(implode(': ',$array)); $value = $this->_toType($value); - $value = array($key => $value); - } elseif (preg_match("/{(.+)}$/",$value,$matches)) { + return array($key => $value); + } + + if ($first_character == '{' && $last_character == '}') { + $innerValue = trim(substr ($value, 1, -1)); + if ($innerValue === '') return array(); // Inline Mapping - // Take out strings sequences and mappings - $explode = $this->_inlineEscape($matches[1]); - - // Propogate value array + $explode = $this->_inlineEscape($innerValue); + // Propagate value array $array = array(); foreach ($explode as $v) { $SubArr = $this->_toType($v); @@ -451,30 +577,37 @@ class Spyc { } $array[] = $SubArr; } - $value = $array; - } elseif (strtolower($value) == 'null' or $value == '' or $value == '~') { - $value = null; - } elseif (preg_match ('/^[1-9]+[0-9]*$/', $value)) { + return $array; + } + + if ($value == 'null' || $value == 'NULL' || $value == 'Null' || $value == '' || $value == '~') { + return null; + } + + if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){ $intvalue = (int)$value; if ($intvalue != PHP_INT_MAX) $value = $intvalue; - } elseif (in_array(strtolower($value), - array('true', 'on', '+', 'yes', 'y'))) { - $value = true; - } elseif (in_array(strtolower($value), - array('false', 'off', '-', 'no', 'n'))) { - $value = false; - } elseif (is_numeric($value)) { - if ($value === '0') return 0; - if (trim ($value, 0) === $value) - $value = (float)$value; - } else { - // Just a normal string, right? + return $value; + } + if (in_array($value, + array('true', 'on', '+', 'yes', 'y', 'True', 'TRUE', 'On', 'ON', 'YES', 'Yes', 'Y'))) { + return true; } + if (in_array(strtolower($value), + array('false', 'off', '-', 'no', 'n'))) { + return false; + } - // print_r ($value); + if (is_numeric($value)) { + if ($value === '0') return 0; + if (rtrim ($value, 0) === $value) + $value = (float)$value; + return $value; + } + return $value; } @@ -489,6 +622,8 @@ class Spyc { // pure mappings and mappings with sequences inside can't go very // deep. This needs to be fixed. + $seqs = array(); + $maps = array(); $saved_strings = array(); // Check for strings @@ -499,39 +634,50 @@ class Spyc { } unset($regex); + $i = 0; + do { + // Check for sequences - if (preg_match_all('/\[(.+)\]/U',$inline,$seqs)) { - $inline = preg_replace('/\[(.+)\]/U','YAMLSeq',$inline); - $seqs = $seqs[0]; + while (preg_match('/\[([^{}\[\]]+)\]/U',$inline,$matchseqs)) { + $seqs[] = $matchseqs[0]; + $inline = preg_replace('/\[([^{}\[\]]+)\]/U', ('YAMLSeq' . (count($seqs) - 1) . 's'), $inline, 1); } // Check for mappings - if (preg_match_all('/{(.+)}/U',$inline,$maps)) { - $inline = preg_replace('/{(.+)}/U','YAMLMap',$inline); - $maps = $maps[0]; + while (preg_match('/{([^\[\]{}]+)}/U',$inline,$matchmaps)) { + $maps[] = $matchmaps[0]; + $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1); } + if ($i++ >= 10) break; + + } while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false); + $explode = explode(', ',$inline); + $stringi = 0; $i = 0; + while (1) { // Re-add the sequences if (!empty($seqs)) { - $i = 0; foreach ($explode as $key => $value) { if (strpos($value,'YAMLSeq') !== false) { - $explode[$key] = str_replace('YAMLSeq',$seqs[$i],$value); - ++$i; + foreach ($seqs as $seqk => $seq) { + $explode[$key] = str_replace(('YAMLSeq'.$seqk.'s'),$seq,$value); + $value = $explode[$key]; + } } } } // Re-add the mappings if (!empty($maps)) { - $i = 0; foreach ($explode as $key => $value) { if (strpos($value,'YAMLMap') !== false) { - $explode[$key] = str_replace('YAMLMap',$maps[$i],$value); - ++$i; + foreach ($maps as $mapk => $map) { + $explode[$key] = str_replace(('YAMLMap'.$mapk.'s'), $map, $value); + $value = $explode[$key]; + } } } } @@ -539,29 +685,60 @@ class Spyc { // Re-add the strings if (!empty($saved_strings)) { - $i = 0; foreach ($explode as $key => $value) { while (strpos($value,'YAMLString') !== false) { - $explode[$key] = preg_replace('/YAMLString/',$saved_strings[$i],$value, 1); - ++$i; + $explode[$key] = preg_replace('/YAMLString/',$saved_strings[$stringi],$value, 1); + unset($saved_strings[$stringi]); + ++$stringi; $value = $explode[$key]; } } } + $finished = true; + foreach ($explode as $key => $value) { + if (strpos($value,'YAMLSeq') !== false) { + $finished = false; break; + } + if (strpos($value,'YAMLMap') !== false) { + $finished = false; break; + } + if (strpos($value,'YAMLString') !== false) { + $finished = false; break; + } + } + if ($finished) break; + + $i++; + if ($i > 10) + break; // Prevent infinite loops. + } + return $explode; } private function literalBlockContinues ($line, $lineIndent) { if (!trim($line)) return true; - if ($this->_getIndent($line) > $lineIndent) return true; + if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true; return false; } + private function referenceContentsByAlias ($alias) { + do { + if (!isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; } + $groupPath = $this->SavedGroups[$alias]; + $value = $this->result; + foreach ($groupPath as $k) { + $value = $value[$k]; + } + } while (false); + return $value; + } + private function addArrayInline ($array, $indent) { $CommonGroupPath = $this->path; if (empty ($array)) return false; - + foreach ($array as $k => $_) { $this->addArray(array($k => $_), $indent); $this->path = $CommonGroupPath; @@ -569,91 +746,115 @@ class Spyc { return true; } - private function addArray ($array, $indent) { - - if (count ($array) > 1) - return $this->addArrayInline ($array, $indent); + private function addArray ($incoming_data, $incoming_indent) { - $key = key ($array); + // print_r ($incoming_data); - if (!isset ($array[$key])) return false; - if ($array[$key] === array()) { $array[$key] = ''; }; - $value = $array[$key]; + if (count ($incoming_data) > 1) + return $this->addArrayInline ($incoming_data, $incoming_indent); + + $key = key ($incoming_data); + $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null; + if ($key === '__!YAMLZero') $key = '0'; - // Unfolding inner array tree as defined in $this->_arrpath. - //$_arr = $this->result; $_tree[0] = $_arr; $i = 1; + if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values. + if ($key || $key === '' || $key === '0') { + $this->result[$key] = $value; + } else { + $this->result[] = $value; end ($this->result); $key = key ($this->result); + } + $this->path[$incoming_indent] = $key; + return; + } - $tempPath = Spyc::flatten ($this->path); - eval ('$_arr = $this->result' . $tempPath . ';'); + + $history = array(); + // Unfolding inner array tree. + $history[] = $_arr = $this->result; + foreach ($this->path as $k) { + $history[] = $_arr = $_arr[$k]; + } if ($this->_containsGroupAlias) { - do { - if (!isset($this->SavedGroups[$this->_containsGroupAlias])) { echo "Bad group name: $this->_containsGroupAlias."; break; } - $groupPath = $this->SavedGroups[$this->_containsGroupAlias]; - eval ('$value = $this->result' . Spyc::flatten ($groupPath) . ';'); - } while (false); + $value = $this->referenceContentsByAlias($this->_containsGroupAlias); $this->_containsGroupAlias = false; } // Adding string or numeric key to the innermost level or $this->arr. - if ($key) - $_arr[$key] = $value; - else { + if (is_string($key) && $key == '<<') { + if (!is_array ($_arr)) { $_arr = array (); } + + $_arr = array_merge ($_arr, $value); + } else if ($key || $key === '' || $key === '0') { + if (!is_array ($_arr)) + $_arr = array ($key=>$value); + else + $_arr[$key] = $value; + } else { if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; } else { $_arr[] = $value; end ($_arr); $key = key ($_arr); } - } - $this->path[$indent] = $key; + $reverse_path = array_reverse($this->path); + $reverse_history = array_reverse ($history); + $reverse_history[0] = $_arr; + $cnt = count($reverse_history) - 1; + for ($i = 0; $i < $cnt; $i++) { + $reverse_history[$i+1][$reverse_path[$i]] = $reverse_history[$i]; + } + $this->result = $reverse_history[$cnt]; - eval ('$this->result' . $tempPath . ' = $_arr;'); + $this->path[$incoming_indent] = $key; if ($this->_containsGroupAnchor) { $this->SavedGroups[$this->_containsGroupAnchor] = $this->path; + if (is_array ($value)) { + $k = key ($value); + if (!is_int ($k)) { + $this->SavedGroups[$this->_containsGroupAnchor][$incoming_indent + 2] = $k; + } + } $this->_containsGroupAnchor = false; } - - } - - - private function flatten ($array) { - $tempPath = array(); - if (!empty ($array)) { - foreach ($array as $_) { - if (!is_int($_)) $_ = "'$_'"; - $tempPath[] = "[$_]"; - } - } - //end ($tempPath); $latestKey = key($tempPath); - $tempPath = implode ('', $tempPath); - return $tempPath; } - - - private function startsLiteralBlock ($line) { + private static function startsLiteralBlock ($line) { $lastChar = substr (trim($line), -1); - if (in_array ($lastChar, $this->LiteralBlockMarkers)) + if ($lastChar != '>' && $lastChar != '|') return false; + if ($lastChar == '|') return $lastChar; + // HTML tags should not be counted as literal blocks. + if (preg_match ('#<.*?>$#', $line)) return false; return $lastChar; - return false; } - private function addLiteralLine ($literalBlock, $line, $literalBlockStyle) { - $line = $this->stripIndent($line); - $line = str_replace ("\r\n", "\n", $line); + private static function greedilyNeedNextLine($line) { + $line = trim ($line); + if (!strlen($line)) return false; + if (substr ($line, -1, 1) == ']') return false; + if ($line[0] == '[') return true; + if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true; + return false; + } + private function addLiteralLine ($literalBlock, $line, $literalBlockStyle, $indent = -1) { + $line = self::stripIndent($line, $indent); + if ($literalBlockStyle !== '|') { + $line = self::stripIndent($line); + } + $line = rtrim ($line, "\r\n\t ") . "\n"; if ($literalBlockStyle == '|') { return $literalBlock . $line; } - if (strlen($line) == 0) return $literalBlock . "\n"; - - // echo "|$line|"; + if (strlen($line) == 0) + return rtrim($literalBlock, ' ') . "\n"; + if ($line == "\n" && $literalBlockStyle == '>') { + return rtrim ($literalBlock, " \t") . "\n"; + } if ($line != "\n") $line = trim ($line, "\r\n ") . " "; - return $literalBlock . $line; } @@ -667,15 +868,13 @@ class Spyc { return $lineArray; } - private function stripIndent ($line, $indent = -1) { - if ($indent == -1) $indent = $this->_getIndent($line); + private static function stripIndent ($line, $indent = -1) { + if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line)); return substr ($line, $indent); } private function getParentPathByIndent ($indent) { - if ($indent == 0) return array(); - $linePath = $this->path; do { end($linePath); $lastIndentInParentPath = key($linePath); @@ -699,27 +898,29 @@ class Spyc { } - private function isComment ($line) { - if (preg_match('/^#/', $line)) return true; + private static function isComment ($line) { + if (!$line) return false; + if ($line[0] == '#') return true; if (trim($line, " \r\n\t") == '---') return true; return false; } + private static function isEmpty ($line) { + return (trim ($line) === ''); + } + + private function isArrayElement ($line) { if (!$line) return false; if ($line[0] != '-') return false; if (strlen ($line) > 3) if (substr($line,0,3) == '---') return false; - + return true; } private function isHashElement ($line) { - if (!preg_match('/^(.+?):/', $line, $matches)) return false; - $allegedKey = $matches[1]; - if ($allegedKey) return true; - //if (substr_count($allegedKey, ) - return false; + return strpos($line, ':'); } private function isLiteral ($line) { @@ -729,45 +930,52 @@ class Spyc { } + private static function unquote ($value) { + if (!$value) return $value; + if (!is_string($value)) return $value; + if ($value[0] == '\'') return trim ($value, '\''); + if ($value[0] == '"') return trim ($value, '"'); + return $value; + } + private function startsMappedSequence ($line) { - if (preg_match('/^-(.*):$/',$line)) return true; + return ($line[0] == '-' && substr ($line, -1, 1) == ':'); } private function returnMappedSequence ($line) { $array = array(); - $key = trim(substr(substr($line,1),0,-1)); - $array[$key] = ''; - return $array; + $key = self::unquote(trim(substr($line,1,-1))); + $array[$key] = array(); + $this->delayedPath = array(strpos ($line, $key) + $this->indent => $key); + return array($array); } private function returnMappedValue ($line) { $array = array(); - $key = trim(substr($line,0,-1)); + $key = self::unquote (trim(substr($line,0,-1))); $array[$key] = ''; return $array; } private function startsMappedValue ($line) { - if (preg_match('/^(.*):$/',$line)) return true; + return (substr ($line, -1, 1) == ':'); } - + private function isPlainArray ($line) { - if (preg_match('/^\[(.*)\]$/', $line)) return true; - return false; + return ($line[0] == '[' && substr ($line, -1, 1) == ']'); } - + private function returnPlainArray ($line) { - return $this->_toType($line); - } + return $this->_toType($line); + } private function returnKeyValuePair ($line) { - $array = array(); - - if (preg_match('/^(.+):/',$line,$key)) { + $key = ''; + if (strpos ($line, ':')) { // It's a key/value pair most likely // If the key is in double quotes pull it out - if (preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) { + if (($line[0] == '"' || $line[0] == "'") && preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) { $value = trim(str_replace($matches[1],'',$line)); $key = $matches[2]; } else { @@ -777,16 +985,13 @@ class Spyc { array_shift($explode); $value = trim(implode(':',$explode)); } - // Set the type of the value. Int, string, etc $value = $this->_toType($value); - if (empty($key)) { - $array[] = $value; - } else { - $array[$key] = $value; - } + if ($key === '0') $key = '__!YAMLZero'; + $array[$key] = $value; + } else { + $array = array ($line); } - return $array; } @@ -802,20 +1007,21 @@ class Spyc { } - private function nodeContainsGroup ($line) { + private function nodeContainsGroup ($line) { $symbolsForReference = 'A-z0-9_\-'; if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-) - if (preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1]; - if (preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1]; - if (preg_match('/(&['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1]; + if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1]; + if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1]; + if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1]; if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1]; + if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1]; return false; } private function addGroup ($line, $group) { - if (substr ($group, 0, 1) == '&') $this->_containsGroupAnchor = substr ($group, 1); - if (substr ($group, 0, 1) == '*') $this->_containsGroupAlias = substr ($group, 1); + if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1); + if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1); //print_r ($this->path); } @@ -823,7 +1029,18 @@ class Spyc { $line = trim(str_replace($group, '', $line)); return $line; } +} +// Enable use of Spyc from command line +// The syntax is the following: php spyc.php spyc.yaml -} -?> +define ('SPYC_FROM_COMMAND_LINE', false); + +do { + if (!SPYC_FROM_COMMAND_LINE) break; + if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) break; + if (empty ($_SERVER['PHP_SELF']) || $_SERVER['PHP_SELF'] != 'spyc.php') break; + $file = $argv[1]; + printf ("Spyc loading file: %s\n", $file); + print_r (spyc_load_file ($file)); +} while (0); \ No newline at end of file