@@ -1,7 +1,7 @@

 (in-package :cl-user)

 (defpackage yaml.scalar

   (:use :cl)

-  (:export :parse-scalar)

+  (:export :parse-scalar :*yaml-11-integers*)

   (:documentation "Parser for scalar values."))

 (in-package :yaml.scalar)

@@ -50,6 +50,17 @@

   (ppcre:create-scanner "^-(\\.inf|\\.Inf|\\.INF)$"))

 ;;; The actual parser

+(defvar *yaml-11-integers* nil)

+

+(defun parse-yaml-integer (string)

+  (if (and *yaml-11-integers*

+           (eql #\0 (elt string 0)))

+      (if (every (lambda (it)

+                   (member it '(#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7)))

+                 string)

+          (parse-integer string :radix 8)

+          string)

+      (parse-integer string)))

 (defun parse-scalar (string &optional (style :plain-scalar-style))

   "Parse a YAML scalar string into a Lisp scalar value."

@@ -67,7 +78,7 @@

      +false+)

     ;; Integers

     ((ppcre:scan +integer-scanner+ string)

-     (parse-integer string))

+     (parse-yaml-integer string))

     ((ppcre:scan +octal-integer-scanner+ string)

      (parse-integer (subseq string 2) :radix 8))

     ((ppcre:scan +hex-integer-scanner+ string)

@@ -9,6 +9,8 @@

   (:import-from :yaml.emitter

                 :emit-object

                 :print-scalar)

+  (:import-from :yaml.scalar

+                :*yaml-11-integers*)

   (:export :parse

            :emit

            :emit-to-string

@@ -16,7 +18,8 @@

            :register-sequence-converter

            :register-mapping-converter

            :emit-object

-           :print-scalar)

+           :print-scalar

+           :*yaml-11-integers*)

   (:documentation "The main YAML interface."))

 (in-package :yaml)