Complete small atoms support

rnewson · May 26, 2012 · 5e00c59 · 5e00c59
1 parent 17917fa
commit 5e00c59
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/scala/scalang/node/HandshakeMessages.scala b/src/main/scala/scalang/node/HandshakeMessages.scala
@@ -63,10 +63,11 @@ object DistributionFlags {
   val exportPtrTag = 0x200
   val bitBinaries = 0x400
   val newFloats = 0x800
+  val smallAtomTags = 0x4000
 
   val default = extendedReferences | extendedPidsPorts |
     bitBinaries | newFloats | funTags | newFunTags |
-    distMonitor | distMonitorName
+    distMonitor | distMonitorName | smallAtomTags
 }
 
 class ErlangAuthException(msg : String) extends Exception(msg)
diff --git a/src/main/scala/scalang/node/ScalaTermDecoder.scala b/src/main/scala/scalang/node/ScalaTermDecoder.scala
@@ -196,7 +196,11 @@ class ScalaTermDecoder(peer : Symbol, factory : TypeFactory) extends OneToOneDec
       case 115 => //small atom
         val length = buffer.readUnsignedByte
         val str = ScalaTermDecoder.fastString(buffer, length)
-        CachedSymbol(str)
+        CachedSymbol(str) match {
+          case 'true => true
+          case 'false => false
+          case atom => atom
+        }
       case 117 => //fun
         val numFree = buffer.readInt
         val pid = readTerm(buffer).asInstanceOf[Pid]

diff --git a/src/main/scala/scalang/node/ScalaTermEncoder.scala b/src/main/scala/scalang/node/ScalaTermEncoder.scala
@@ -215,9 +215,14 @@ class ScalaTermEncoder(peer: Symbol) extends OneToOneEncoder with Logging with I
   }
 
   def writeAtom(buffer : ChannelBuffer, s : Symbol) {
-    buffer.writeByte(100)
     val bytes = s.name.getBytes
-    buffer.writeShort(bytes.length)
+    if (bytes.length < 256) {
+      buffer.writeByte(115)
+      buffer.writeByte(bytes.length)
+    } else {
+      buffer.writeByte(100)
+      buffer.writeShort(bytes.length)
+    }
     buffer.writeBytes(bytes)
   }