Add Type Convert #196

lightszero · 2020-03-05T04:43:01Z

fixed #195

Tommo-L · 2020-03-05T05:40:49Z

tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_TypeConvert.cs

+
+
+        [OpCode(SmartContract.Framework.OpCode.CONVERT, "0x21")]
+        public extern static BigInteger ConvertToInteger(byte[] from);


Could we still use the AsByteArray as the function name?

Maybe we should move these to SmartContract.Framework

if we do not care about old contract code,we can direct change AsByteArray.

Just ignore the old contract, as the previous version could not invoke contract successful. 😂

ok，let us add more convert code in framework and compiler

pushNumber pushBoolean pushDataArray 過去合約中所有的數值是統一的Push 小於等於16的數字和 byte[0] 和 true false 是Integer >16的數字和 byte[n>0] 是 ByteArray 現在在合約中使用數值將直接得到正確的類型 new byte[0] 是ByteArray true 是Boolean 17 是Integer

因爲現在會返回integer類型了，不再是DataArray 2.修改了TypeConvert 應該現在 new byte[0] 直接是ByteArray類型了

…ect/neo-devpack-dotnet into Branch_lights_utconvert

lightszero · 2020-03-05T10:23:17Z

I had do some fix

now
new byte[0] =>ByteArray
new byte[3]{1,2,3}=>ByteArray
true =>Boolean
1=>Integer
2=>Integer
17 =>Integer

const value will got right type without convert.

2.Use Helper.AsBigInteger() to convert to BigInteger 3.fix unittest

lightszero · 2020-03-05T11:04:03Z

Helper.AsByteArray() fixed.

tests/Neo.Compiler.MSIL.UnitTests/UnitTest_TypeConvert.cs

lightszero · 2020-03-09T13:49:09Z

@shargon has a format problem,fix it.
@Tommo-L what do you think?should we merge this?

Tommo-L · 2020-03-10T02:14:38Z

I'll review it today.

src/Neo.Compiler.MSIL/MSIL/Conv_Common.cs

Tommo-L · 2020-03-10T03:39:39Z

src/Neo.SmartContract.Framework/Helper.cs


        /// <summary>
        /// Converts BigInteger to byte[]. No guarantees are assumed regarding BigInteger working range.
        /// Examples: 10 -> [0x0a]; 10 -> [0x0a00]; -128 -> [0x80]; -128 -> [0x80ff]; 0 -> []; 0 -> [0x00]; 255 -> [0xff00]
        /// </summary>
-        [Script]
+        [OpCode(OpCode.CONVERT, StackItemType_ByteArray)]
        public extern static byte[] AsByteArray(this BigInteger source);


Maybe we need to update the comments later.

Tommo-L · 2020-03-10T04:04:57Z

tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_TypeConvert.cs

+            var int3 = bts3.AsBigInteger();
+
+            var arrobj = new object[8];
+            arrobj[0] = int0;


I think we should add a test case for _ConvertPushBoolean.

That's hard,in IL sometimes bool is int too.

erikzhang · 2020-03-11T09:06:34Z

src/Neo.SmartContract.Framework/Helper.cs

        /// <summary>
        /// Converts byte to byte[] considering the byte as a BigInteger (0x00 at the end)
        /// </summary>
-        [Script]
+        [OpCode(OpCode.CONVERT, StackItemType_ByteArray)]
        public extern static byte[] AsByteArray(this byte source);


If we use CONVERT, we should rename the methods from As*** to To***. Because "As" implies the meaning of not performing the actual type conversion.

#196 because Insert a Opcode Convert but newarr still get last opcode for a PushNumber 2.add some unittest for it.

this unittest for

d4a231a

#195

lightszero requested review from shargon and Tommo-L March 5, 2020 04:43

Tommo-L reviewed Mar 5, 2020

View reviewed changes

shargon and others added 4 commits March 5, 2020 06:53

Clean code

2cc7c26

1.修改了unittest null

4d9b845

因爲現在會返回integer類型了，不再是DataArray 2.修改了TypeConvert 應該現在 new byte[0] 直接是ByteArray類型了

Merge branch 'Branch_lights_utconvert' of https://github.com/neo-proj…

4dbd044

…ect/neo-devpack-dotnet into Branch_lights_utconvert

lightszero changed the title ~~add a convert unittest.~~ Add Type Convert Mar 5, 2020

1.Use Helper.AsByteArray() to convert to ByteArray

8bac65b

2.Use Helper.AsBigInteger() to convert to BigInteger 3.fix unittest

fix one small fault.

5b63eaf

lightszero requested a review from Tommo-L March 5, 2020 13:41

Merge branch 'master' into Branch_lights_utconvert

d96499d

shargon reviewed Mar 5, 2020

View reviewed changes

tests/Neo.Compiler.MSIL.UnitTests/UnitTest_TypeConvert.cs Show resolved Hide resolved

add value equal test

d7f3037

lightszero requested a review from shargon March 9, 2020 02:34

shargon added 2 commits March 9, 2020 11:28

Clean code

b26a6ed

Clean code

fecb35e

shargon previously approved these changes Mar 9, 2020

View reviewed changes

fix format

494826f

lightszero dismissed shargon’s stale review via 494826f March 9, 2020 13:45

lightszero requested a review from shargon March 9, 2020 13:48

Tommo-L mentioned this pull request Mar 10, 2020

Ship Neo 3 Preview 2 neo-project/neo#1467

Closed

Tommo-L reviewed Mar 10, 2020

View reviewed changes

shargon approved these changes Mar 10, 2020

View reviewed changes

lightszero merged commit 8acf90f into master Mar 11, 2020

lightszero deleted the Branch_lights_utconvert branch March 11, 2020 03:41

erikzhang reviewed Mar 11, 2020

View reviewed changes

shargon mentioned this pull request Mar 11, 2020

Rename commands #200

Merged

superboyiii mentioned this pull request Mar 12, 2020

BigInteger 0 isn't able to be convert to Byte[]{ 0 } #201

Closed

lightszero added a commit that referenced this pull request Mar 12, 2020

1.fix a bug about convert func

275bae1

#196 because Insert a Opcode Convert but newarr still get last opcode for a PushNumber 2.add some unittest for it.

lightszero mentioned this pull request Mar 12, 2020

fix a bug about convert func #203

Merged

lightszero added a commit that referenced this pull request Mar 13, 2020

1.fix a bug about convert func (#203)

b51c2b1

#196 because Insert a Opcode Convert but newarr still get last opcode for a PushNumber 2.add some unittest for it.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Type Convert #196

Add Type Convert #196

lightszero commented Mar 5, 2020

Tommo-L Mar 5, 2020

shargon Mar 5, 2020

lightszero Mar 5, 2020

Tommo-L Mar 5, 2020 •

edited

Loading

lightszero Mar 5, 2020

lightszero commented Mar 5, 2020

lightszero commented Mar 5, 2020

lightszero commented Mar 9, 2020

Tommo-L commented Mar 10, 2020

Tommo-L Mar 10, 2020

Tommo-L Mar 10, 2020

lightszero Mar 11, 2020

erikzhang Mar 11, 2020 •

edited

Loading



		[OpCode(SmartContract.Framework.OpCode.CONVERT, "0x21")]
		public extern static BigInteger ConvertToInteger(byte[] from);

Add Type Convert #196

Add Type Convert #196

Conversation

lightszero commented Mar 5, 2020

Tommo-L Mar 5, 2020

Choose a reason for hiding this comment

shargon Mar 5, 2020

Choose a reason for hiding this comment

lightszero Mar 5, 2020

Choose a reason for hiding this comment

Tommo-L Mar 5, 2020 • edited Loading

Choose a reason for hiding this comment

lightszero Mar 5, 2020

Choose a reason for hiding this comment

lightszero commented Mar 5, 2020

lightszero commented Mar 5, 2020

lightszero commented Mar 9, 2020

Tommo-L commented Mar 10, 2020

Tommo-L Mar 10, 2020

Choose a reason for hiding this comment

Tommo-L Mar 10, 2020

Choose a reason for hiding this comment

lightszero Mar 11, 2020

Choose a reason for hiding this comment

erikzhang Mar 11, 2020 • edited Loading

Choose a reason for hiding this comment

Tommo-L Mar 5, 2020 •

edited

Loading

erikzhang Mar 11, 2020 •

edited

Loading